Slight renaming of namespaces to match projects