api renaming to comply with plural conventions