Renamed Generic Types Correctly