(Bug 34383) Canonical namespace names

For more details, see [1].

[1] https://bugzilla.wikimedia.org/show_bug.cgi?id=34383