Change naming style for variables