Changed some class and methods names. Detailing some comment content.