Fixing couple more class constants not namespaced.