Remove a lot of twos

The new names fit better with Elm's conventions.