Replaced usages of NonLivingType with EntityType to prepare for a branch being merged.