Volume “broken” in Sierra/Kodi 17

I recently upgraded to Sierra and Kodi 17 as well, so I don’t know what caused what, but the situation is as follows;

I have a number of shares on my NAS, which I access using AFP. I mount the shares on my OSX desktop, as “Films”, “Series”, “Music”, and “Pictures”. That has worked beautifully for years.

However, after the recent updates I realised that whereas “Music”, “Pictures”, and “Series” work as expected, “Films” does not. Kodi simply didn’t see the volume, and I found out that the “Films” volume no longer is called “Films”, but “Films~1”, hence Kodi does not see the correct volume.

This even changes, and after a reboot, I sometimes can indeed see the “Films” volume as “Films”, and sometimes as “Films~1”.

I tried switching to SMB and the same holds true.

Any help?