Documentation + method renaming.