fixed up Namespaces in Residency Layout