iCloud integration changes custom entity names every time I reauthenticate

My iCloud integration changes custom entity names every time I reauthenticate it.

I have edited my iCloud entity names to add an ‘_icloud’ suffix, but every month or two I have to reauthenticate iCloud and when I do that the entity names all revert. So I have to manually edit them all over again.

Is there a way to prevent this?