Added entity names to schema properties