Make all the server methods follow the same naming convention.

Change-Id: I54f6bad391af2ea62b0b87bc02f2499902f55a80