Fix namespaces and use statement

These were introduced in:
I2987e6875e288632cf9ca3ec8199581b427fc2cd

https://gerrit.wikimedia.org/r/#/c/151145/9

Change-Id: I02fe9a0a44d5f28458dca982cb8e33fe84de5abf
Merge "Fix namespaces and use statement"