Merge "Rename entity artifacts, remove obsolete entities"