#13, rename api class to follow conventions