Fixed enum namespacing errors

Could these continue to be `pub use`'d for now (they weren't renamed below)