EAGLESIX-2691 Upgraded the files touched previously to use the new Factories/Templates.