Renamed some functions and namespaces