Upgrade remaining things

Upgrading Ruby changed the class names as well.