updated some class names to follow conventions