Heh, we just got rid of the namespaces. Makes sense to add them both back, though, to prevent conflicts and be consistent too.