cleaned up naming of certain classes