Name refactoring

Refactoring of method names