refactored class/method names