Removed underscore remapping