renamed all functions to comply with convention