Renaming :subject to :entity