Switched var and file names to camelCase