Marrying naming convention to all functions

Just to make it easier during the report writing