@qjia7 's PR1287 about event type correcting is still under review, so I am not sure it is the right time to change Storage's event name now, maybe changing them after PR1287 merged is better.  Ping @halton.