Index: sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp
===================================================================
--- sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp	(revision 2cb89e7643de78c7f4cf32435454270403afcfb9)
+++ sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -87,7 +87,7 @@
         // Initialize parameter dictionary
         PyDict_SetItemString(self->params,"short_a",Py_BuildValue("d",35.000000));
+        PyDict_SetItemString(self->params,"short_b",Py_BuildValue("d",75.000000));
         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
-        PyDict_SetItemString(self->params,"long_b",Py_BuildValue("d",75.000000));
-        PyDict_SetItemString(self->params,"longer_c",Py_BuildValue("d",400.000000));
+        PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.000000));
         PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.000000));
         PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.000000));
@@ -102,9 +102,9 @@
         PyDict_SetItemString(self->dispersion, "short_a", disp_dict);
         disp_dict = PyDict_New();
-        self->model->long_b.dispersion->accept_as_source(visitor, self->model->long_b.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "long_b", disp_dict);
+        self->model->short_b.dispersion->accept_as_source(visitor, self->model->short_b.dispersion, disp_dict);
+        PyDict_SetItemString(self->dispersion, "short_b", disp_dict);
         disp_dict = PyDict_New();
-        self->model->longer_c.dispersion->accept_as_source(visitor, self->model->longer_c.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "longer_c", disp_dict);
+        self->model->long_c.dispersion->accept_as_source(visitor, self->model->long_c.dispersion, disp_dict);
+        PyDict_SetItemString(self->dispersion, "long_c", disp_dict);
         disp_dict = PyDict_New();
         self->model->parallel_phi.dispersion->accept_as_source(visitor, self->model->parallel_phi.dispersion, disp_dict);
@@ -247,7 +247,7 @@
 	    // Reader parameter dictionary
     self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") );
+    self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") );
     self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
-    self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") );
-    self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") );
+    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") );
     self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") );
     self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") );
@@ -260,8 +260,8 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "short_a");
     self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "long_b");
-    self->model->long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "longer_c");
-    self->model->longer_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "short_b");
+    self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "long_c");
+    self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict);
     disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi");
     self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict);
@@ -333,7 +333,7 @@
 	    // Reader parameter dictionary
     self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") );
+    self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") );
     self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
-    self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") );
-    self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") );
+    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") );
     self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") );
     self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") );
@@ -346,8 +346,8 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "short_a");
     self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "long_b");
-    self->model->long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "longer_c");
-    self->model->longer_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "short_b");
+    self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "long_c");
+    self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict);
     disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi");
     self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict);
@@ -408,7 +408,7 @@
 	    // Reader parameter dictionary
     self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") );
+    self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") );
     self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
-    self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") );
-    self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") );
+    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") );
     self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") );
     self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") );
@@ -421,8 +421,8 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "short_a");
     self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "long_b");
-    self->model->long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "longer_c");
-    self->model->longer_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "short_b");
+    self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "long_c");
+    self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict);
     disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi");
     self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict);
@@ -488,8 +488,8 @@
     if (!strcmp(par_name, "short_a")) {
         self->model->short_a.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "long_b")) {
-        self->model->long_b.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "longer_c")) {
-        self->model->longer_c.dispersion = dispersion;
+    } else    if (!strcmp(par_name, "short_b")) {
+        self->model->short_b.dispersion = dispersion;
+    } else    if (!strcmp(par_name, "long_c")) {
+        self->model->long_c.dispersion = dispersion;
     } else    if (!strcmp(par_name, "parallel_phi")) {
         self->model->parallel_phi.dispersion = dispersion;
Index: sansmodels/src/sans/models/c_models/models.hh
===================================================================
--- sansmodels/src/sans/models/c_models/models.hh	(revision eddff027b43bf6dfb5f35d7d30e3a458f64c1c41)
+++ sansmodels/src/sans/models/c_models/models.hh	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -50,6 +50,6 @@
 	Parameter scale;
 	Parameter short_a;
-	Parameter long_b;
-	Parameter longer_c;
+	Parameter short_b;
+	Parameter long_c;
 	Parameter contrast;
 	Parameter background;
Index: sansmodels/src/sans/models/c_models/parallelepiped.cpp
===================================================================
--- sansmodels/src/sans/models/c_models/parallelepiped.cpp	(revision 3c102d483d76eaaef80c6c9f1e39089cfbd6799b)
+++ sansmodels/src/sans/models/c_models/parallelepiped.cpp	(revision 8e36cddc31aee946bb051c6a6d4eade849ca2ed4)
@@ -37,8 +37,8 @@
 	short_a     = Parameter(35.0, true);
 	short_a.set_max(1.0);
-	long_b     = Parameter(75.0, true);
-	long_b.set_min(1.0);
-	longer_c     = Parameter(400.0, true);
-	longer_c.set_min(1.0);
+	short_b     = Parameter(75.0, true);
+	short_b.set_min(1.0);
+	long_c     = Parameter(400.0, true);
+	long_c.set_min(1.0);
 	contrast   = Parameter(53.e-7);
 	background = Parameter(0.0);
@@ -61,6 +61,6 @@
 	dp[0] = scale();
 	dp[1] = short_a();
-	dp[2] = long_b();
-	dp[3] = longer_c();
+	dp[2] = short_b();
+	dp[3] = long_c();
 	dp[4] = contrast();
 	dp[5] = 0.0;
@@ -71,10 +71,10 @@
 
 	// Get the dispersion points for the longer_edgeB
-	vector<WeightPoint> weights_long_b;
-	long_b.get_weights(weights_long_b);
+	vector<WeightPoint> weights_short_b;
+	short_b.get_weights(weights_short_b);
 
 	// Get the dispersion points for the longuest_edgeC
-	vector<WeightPoint> weights_longer_c;
-	longer_c.get_weights(weights_longer_c);
+	vector<WeightPoint> weights_long_c;
+	long_c.get_weights(weights_long_c);
 
 
@@ -89,16 +89,16 @@
 
 		// Loop over longer_edgeB weight points
-		for(int j=0; j< (int)weights_long_b.size(); j++) {
-			dp[2] = weights_long_b[j].value;
+		for(int j=0; j< (int)weights_short_b.size(); j++) {
+			dp[2] = weights_short_b[j].value;
 
 			// Loop over longuest_edgeC weight points
-			for(int k=0; k< (int)weights_longer_c.size(); k++) {
-				dp[3] = weights_longer_c[k].value;
-
-				sum += weights_short_a[i].weight * weights_long_b[j].weight
-					* weights_longer_c[k].weight * Parallelepiped(dp, q);
+			for(int k=0; k< (int)weights_long_c.size(); k++) {
+				dp[3] = weights_long_c[k].value;
+
+				sum += weights_short_a[i].weight * weights_short_b[j].weight
+					* weights_long_c[k].weight * Parallelepiped(dp, q);
 
 				norm += weights_short_a[i].weight
-					 * weights_long_b[j].weight * weights_longer_c[k].weight;
+					 * weights_short_b[j].weight * weights_long_c[k].weight;
 			}
 		}
@@ -117,6 +117,6 @@
 	dp.scale      = scale();
 	dp.short_a   = short_a();
-	dp.long_b   = long_b();
-	dp.longer_c  = longer_c();
+	dp.short_b   = short_b();
+	dp.long_c  = long_c();
 	dp.contrast   = contrast();
 	dp.background = 0.0;
@@ -132,10 +132,10 @@
 
 	// Get the dispersion points for the longer_edgeB
-	vector<WeightPoint> weights_long_b;
-	long_b.get_weights(weights_long_b);
+	vector<WeightPoint> weights_short_b;
+	short_b.get_weights(weights_short_b);
 
 	// Get angular averaging for the longuest_edgeC
-	vector<WeightPoint> weights_longer_c;
-	longer_c.get_weights(weights_longer_c);
+	vector<WeightPoint> weights_long_c;
+	long_c.get_weights(weights_long_c);
 
 	// Get angular averaging for theta
@@ -160,10 +160,10 @@
 
 		// Loop over longer_edgeB weight points
-		for(int j=0; j< (int)weights_long_b.size(); j++) {
-			dp.long_b = weights_long_b[j].value;
+		for(int j=0; j< (int)weights_short_b.size(); j++) {
+			dp.short_b = weights_short_b[j].value;
 
 			// Average over longuest_edgeC distribution
-			for(int k=0; k< (int)weights_longer_c.size(); k++) {
-				dp.longer_c = weights_longer_c[k].value;
+			for(int k=0; k< (int)weights_long_c.size(); k++) {
+				dp.long_c = weights_long_c[k].value;
 
 				// Average over theta distribution
@@ -180,6 +180,6 @@
 
 							double _ptvalue = weights_short_a[i].weight
-								* weights_long_b[j].weight
-								* weights_longer_c[k].weight
+								* weights_short_b[j].weight
+								* weights_long_c[k].weight
 								* weights_parallel_theta[l].weight
 								* weights_parallel_phi[m].weight
@@ -192,6 +192,6 @@
 
 							norm += weights_short_a[i].weight
-								* weights_long_b[j].weight
-								* weights_longer_c[k].weight
+								* weights_short_b[j].weight
+								* weights_long_c[k].weight
 								* weights_parallel_theta[l].weight
 								* weights_parallel_phi[m].weight
