Change names not to use the same name for a namespace and a type in that namespace