Renamed projects to align namespaces