Script variable naming cleanup
Added support back for rbenv