Add comments and fix naming inconsistency in client API