Everything really does use mkName
fix some warnings