Added package prefix to all entities