Fixed whole boatload of namespace issues