Change namespaces + CS fixes