NameUtil/StringUtil to support capitalization changes