Fixed / renamed some namespaces

and some small fixes.