Some renaming. Added a test.