More class constants needing namespacing.