minor changes in classes names.
minor changes in classes names.