Classes renamed to be less stupid