Added server health check.
Misc renaming.