Renamings and docstring fixed