(feat) updates eventName and add comments