Issue #3583643 by DamienMcKenna: Reverted changes to MetaNameBase that accidentally broke other modules.
Closes #3583643