Fixed wrong namespaces and some sort of other cs fixes.