Removed some more FQN's and imported the namespaces with an alias