Changed resource naming to entity naming