entity name formatting update