Fix namespaces in entities