made class names more generic