refactor class names a little bit