Fixed namespaces of a couple of components

They were created before a separate package was added for components and
were improperly refactored.