Merge "Adjust file name in style module after rename"