improved naming in apidemos