Solved fuckups with namespaces