Some renaming and a bit more documentation.