RF: change names to follow pep8