Use more unique names, issue spotted by xyz32