renaming helper classes