Perplexed about flexinode/event in 4.7 becoming CCK/Date/Event in 5.x

I'm in the process of upgrading a 4.7 installation to 5.x (so I can upgrade to 6.x). My 4.7 installation used the flexinode module, and the event module on top of flexinode, to maintain a calendar of events. I would like to maintain a calendar in the upgraded system, and migrate all the old event content into it. But I am perplexed about the relative roles of CCK (in particular CCK date) and the 5.x event module (which appears to be backward compatible with 4.7) and calendar modules as replacements for flexinode and 4.7 events. 5.x has no flexinode module. When I include the "backward compatible" event 5.x module, I do get my old events, in a calendar, listed correctly. However, they are now listed as items of type "flexinode-1" which is a bit ugly and likely confusing to my users. What is the "correct" method to bring forward my events into 5.x? Am I supposed to use flexiconvert to turn them into some kind of CCK content?