Fix and tweak peripheral name generation