Fix missing namespace prefix, fix wrong usage of prefix