removed the suffix handlers from api class names