Update #003: update some other classes to use the new naming