There will be more intelligent logic added soon, but for now this is the only option you'll have. Btw, refreshing the catalog doesn't update these names, the names you give them is preserved.
Also, often these duplicate names are a result of relations found which are not really needed. You can 'hide' these in the designer as well.