Refactoring

Homogenizing the function names.