class name change. Added 'this' keyword in some fields, methods.