Merge pull request #10904 from SmithSamuelM/sam_raet_14

Sam raet 14  Fixed naming a couple of places also tested with new ioflo