Changed some functions name to increase code readability