Renames classes & removes pry