more namespaces & renames!
Fixing new names