Fixed Comments naming conventions to Comment where necessary