More clean-up for ETPU rename.