Change name classes, add some comments