Revert last commit--the long name is internal only and fine