In some locales, letters sort before numbers, so change the object
naming to not depend on that.  Introduced by commit
7c079d74.