issue #2837: Modify some api and variables format