Renamed namespaces to follow convention.