Refactor variable names to camelCase