Minor modification to various comments and class names