Baking in renaming for core library types