Cleanup of variable naming and consts.

nServerPort -> serverPort ?