rename classes and members to more intuitive names