Avoid the double-namespace