Updating namespaces a bit for consistency. Should have planned this better ...