updated some class names to be a little more meaningful