Removed Apollo class prefixes on some last stragglers