Changed variabls to camel case and names to be consistent across all files