Redo serial name fixup from 799ed2b98984414fd3b7b667c5e3e5d2e6d35a66
reduz wanted the original PR reverted due to issues, so this follow-up had to be too
(done in 8cb54182ad2698a962def84f79cc8206ac9f13b2). But he ended up adapting part of
the original PR in 27d77723811c2652c6118eca03a38c4ae1441895 without including this fix.