Simplification of Renamed Handling