Moving constants into namespaces