Method cleanup.

Sync various methods and filenames with C++ versions
8 files changed