Fixing a few places where the super long version of DREAM3D was not needed.