Class name is unreliable in base.rb

Debugging here, not a final fix.