rename classes to use Helper naming convention.