Minor changes, continued attempt to correct naming issues. SEW 23NOV2014