Reflect coding style and API change

Use double underscore "__" prefix to denote invisible
methods. Use updated API.