Rename functions to better cope with naming standards