Updated file names to camel casing