Index: /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/Square.par	(revision 3757)
@@ -17,16 +17,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.0;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/Square.par	(revision 3757)
@@ -17,15 +17,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/Square.par	(revision 3757)
@@ -17,15 +17,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/Square.par	(revision 3757)
@@ -17,16 +17,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.0;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/Square.par	(revision 3757)
@@ -18,15 +18,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/Square.par	(revision 3757)
@@ -18,16 +18,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/Square.par	(revision 3757)
@@ -19,10 +19,10 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.0;
 
@@ -30,6 +30,6 @@
 md.min_thermal_constraints=3;
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/Square.par
===================================================================
--- /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/Square.par	(revision 3757)
@@ -16,15 +16,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/Pig.par
===================================================================
--- /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/Pig.par	(revision 3756)
+++ /issm/trunk/test/Verification/test20_PigControlMethodDragM2d/Pig.par	(revision 3757)
@@ -14,10 +14,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -26,6 +26,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -39,5 +39,5 @@
 %Misc
 md.verbose=0;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.05;
Index: /issm/trunk/test/Verification/test21_PigControlMethodBM2d/Pig.par
===================================================================
--- /issm/trunk/test/Verification/test21_PigControlMethodBM2d/Pig.par	(revision 3756)
+++ /issm/trunk/test/Verification/test21_PigControlMethodBM2d/Pig.par	(revision 3757)
@@ -14,10 +14,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -26,6 +26,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -39,5 +39,5 @@
 %Misc
 md.verbose=0;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.005;
Index: /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/Pig.par
===================================================================
--- /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/Pig.par	(revision 3756)
+++ /issm/trunk/test/Verification/test22_PigControlMethodDragP3d/Pig.par	(revision 3757)
@@ -14,10 +14,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -26,6 +26,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -39,5 +39,5 @@
 %Misc
 md.verbose=0;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.05;
Index: /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/Pig.par
===================================================================
--- /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/Pig.par	(revision 3756)
+++ /issm/trunk/test/Verification/test23_PigControlMethodDragS3d/Pig.par	(revision 3757)
@@ -17,10 +17,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -29,6 +29,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -42,5 +42,5 @@
 %Misc
 md.verbose=0;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.01;
Index: /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/Square.par
===================================================================
--- /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -43,4 +43,4 @@
 md.rifts.fill=MelangeEnum();
 md.rifts.fraction=0;
-md.penalty_lock=2;
+md.drag_penalty_lock=2;
 md.rifts.fractionincrement=.1;
Index: /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par
===================================================================
--- /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par	(revision 3756)
+++ /issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par	(revision 3757)
@@ -16,16 +16,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=20*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -48,16 +48,16 @@
 md.responses.rf (end+1)=response_function('max_vel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
 
-md.qmu_method     =dakota_method('nond_l');
+md.drag_qmu_method     =dakota_method('nond_l');
 
-md.qmu_params.direct=true;
-md.qmu_params.analysis_driver='diagnostic';
-md.qmu_params.evaluation_concurrency=1;
-md.qmu_params.interval_type='forward';
-md.qmu_params.tabular_graphics_data=true;
+md.drag_qmu_params.direct=true;
+md.drag_qmu_params.analysis_driver='diagnostic';
+md.drag_qmu_params.evaluation_concurrency=1;
+md.drag_qmu_params.interval_type='forward';
+md.drag_qmu_params.tabular_graphics_data=true;
 
-md.part=0:1:md.numberofgrids-1;
-md.part=md.part';
+md.drag_part=0:1:md.numberofgrids-1;
+md.drag_part=md.drag_part';
 md.npart=md.numberofgrids;
-md.qmu_analysis=1;
+md.drag_qmu_analysis=1;
 
 md.eps_rel=10^-10; %tighten for qmu analysese
Index: /issm/trunk/test/Verification/test26_Balanced2d/79North.par
===================================================================
--- /issm/trunk/test/Verification/test26_Balanced2d/79North.par	(revision 3756)
+++ /issm/trunk/test/Verification/test26_Balanced2d/79North.par	(revision 3757)
@@ -19,10 +19,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -31,6 +31,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -47,5 +47,5 @@
 %Misc
 md.verbose=10;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.05;
Index: /issm/trunk/test/Verification/test27_Balanced3d/79North.par
===================================================================
--- /issm/trunk/test/Verification/test27_Balanced3d/79North.par	(revision 3756)
+++ /issm/trunk/test/Verification/test27_Balanced3d/79North.par	(revision 3757)
@@ -19,10 +19,10 @@
 disp('      creating drag');
 md.drag_type=2;
-md.drag=50*ones(md.numberofgrids,1);
+md.drag_coefficient=50*ones(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -31,6 +31,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
@@ -47,5 +47,5 @@
 %Misc
 md.verbose=10;
-md.plot=0;
+md.drag_plot=0;
 md.eps_abs=NaN;
 md.eps_rel=0.05;