changed a few more file names to get away from camelCase