Some renaming and testing.