Fix bug brought forward by namespacing all entities.