Removing ETBD references from naming conventions