Fixed naming issues with retro/retros