Renamed some functions to keep them unique