Rename regserver methods properly.
Formatting cleanup.