Renamed some namespaces to make it nicer.