refactored basic api class names