Update variables naming to Camel Case