Some more PixelBarrelNameWrapper() insertions in order to avoid additional 'if (isUpgrade)' statements for purposes of determining if PixelBarrelName or PixelBarrelNameUpgrade is used.