improved api class name