Remove redundant top-level constant

Also, fixed namespace