More fix attempts

Just the names should be wrong now.
-Steven