More enum namespacing preparation