Update for new output naming.