Renamed variable names to camelcase