Fixing nameWithTagOverride