Fix enum names, begin namespacing