Support Entity Verbiage Changes

Support Entity Verbiage Changes