Changed the namespaces to be more consistent with the other modules.