Fix file names for better convention - used camelCase