Fix some method names
Rename some method names
Revert "Rename some method names"

This reverts commit 1bbd6d64c2e850bcab1c5e19a82378424dedb292.
Revert "Revert "Rename some method names""

This reverts commit 834a095cccd7df621da0afd3011a71137de8387e.