Remove old naming.