Changed the camelCase of certain function to snake_case