Remove old legacy code for names