Fix some infinite recursion and some final rename issues from Cuby to EleetScript