diff --git a/Doc/FFCatalog/fig/ff2/bornplot.py b/Doc/FFCatalog/fig/ff2/bornplot.py
index 68acc9952e5537f49d738cb4a363e3b432355972..9d95e97704a30af16b63d8878108463506250cf2 100644
--- a/Doc/FFCatalog/fig/ff2/bornplot.py
+++ b/Doc/FFCatalog/fig/ff2/bornplot.py
@@ -142,7 +142,7 @@ def run_simulation(det, ff, trafo=None):
     :param trafo: Optional rotation
     """
     zero = ba.C3(0, 0, 0)
-    volume = abs(ff.evaluate_for_q(zero))
+    volume = abs(ff.formfactor(zero))
     print("Volume: %g" % volume)
     sample = get_sample(ff, trafo)
     beam = ba.Beam(1, 1*angstrom, ba.Direction(1e-8*deg, 0))
diff --git a/Examples/varia/CustomFormFactor.py b/Examples/varia/CustomFormFactor.py
index 702bb3f338d69d868d0aa5b520d34e7727bd6de1..e2105236c7160927c72d049e46ddf8eee976e067 100755
--- a/Examples/varia/CustomFormFactor.py
+++ b/Examples/varia/CustomFormFactor.py
@@ -35,7 +35,7 @@ class CustomFormFactor(ba.IBornFF):
         cloned_ff.transferToCPP()
         return cloned_ff
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         qzhH = 0.5*q.z()*self.H
         qxhL = 0.5*q.x()*self.L
         qyhL = 0.5*q.y()*self.L
diff --git a/Sample/HardParticle/FormFactorBox.cpp b/Sample/HardParticle/FormFactorBox.cpp
index 8179aa70dcdcfea7312ec875c6210e92e3ed3470..66727e1f3dfbbecc40905b232be787cb8605f975 100644
--- a/Sample/HardParticle/FormFactorBox.cpp
+++ b/Sample/HardParticle/FormFactorBox.cpp
@@ -34,7 +34,7 @@ FormFactorBox::FormFactorBox(double length, double width, double height)
 {
 }
 
-complex_t FormFactorBox::evaluate_for_q(C3 q) const
+complex_t FormFactorBox::formfactor(C3 q) const
 {
     complex_t qzHdiv2 = m_height / 2 * q.z();
     return m_length * m_width * m_height * Math::sinc(m_length / 2 * q.x())
diff --git a/Sample/HardParticle/FormFactorBox.h b/Sample/HardParticle/FormFactorBox.h
index 4b795f0c3caf12d18931cb6ece5bac552d23ccac..033e624c2bd7e673622ef898ca5783cd82ce6e48 100644
--- a/Sample/HardParticle/FormFactorBox.h
+++ b/Sample/HardParticle/FormFactorBox.h
@@ -37,7 +37,7 @@ public:
 
     double volume() const override { return m_length * m_height * m_width; }
     double radialExtension() const override { return m_length / 2.0; }
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorCone.cpp b/Sample/HardParticle/FormFactorCone.cpp
index feed23fb1838e7632f440eb1b5b97bf0f8261302..387d2da1f1585330615172311e6d828712fa498c 100644
--- a/Sample/HardParticle/FormFactorCone.cpp
+++ b/Sample/HardParticle/FormFactorCone.cpp
@@ -51,7 +51,7 @@ FormFactorCone::FormFactorCone(double radius, double height, double alpha)
 {
 }
 
-complex_t FormFactorCone::evaluate_for_q(C3 q) const
+complex_t FormFactorCone::formfactor(C3 q) const
 {
     if (std::abs(q.mag()) < std::numeric_limits<double>::epsilon()) {
         double R = m_radius;
diff --git a/Sample/HardParticle/FormFactorCone.h b/Sample/HardParticle/FormFactorCone.h
index 000b184c1560dfdff59aae2523a013297bd396b8..25cf0120bc1eb90950381d21b51bca873d83e444 100644
--- a/Sample/HardParticle/FormFactorCone.h
+++ b/Sample/HardParticle/FormFactorCone.h
@@ -40,7 +40,7 @@ public:
 
     double radialExtension() const override { return m_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorCylinder.cpp b/Sample/HardParticle/FormFactorCylinder.cpp
index 03909658e7ef440c3f1d9d04d68dd64aad51a6ab..4a539b301fd859e63c4ec582390b76242831bb59 100644
--- a/Sample/HardParticle/FormFactorCylinder.cpp
+++ b/Sample/HardParticle/FormFactorCylinder.cpp
@@ -35,7 +35,7 @@ FormFactorCylinder::FormFactorCylinder(double radius, double height)
 {
 }
 
-complex_t FormFactorCylinder::evaluate_for_q(C3 q) const
+complex_t FormFactorCylinder::formfactor(C3 q) const
 {
     double R = m_radius;
     double H = m_height;
diff --git a/Sample/HardParticle/FormFactorCylinder.h b/Sample/HardParticle/FormFactorCylinder.h
index 9d71be381b9d5172ae8726e2b9203403fa7a23da..6d5ec34275c9e5a39bceda74349507d634632a8e 100644
--- a/Sample/HardParticle/FormFactorCylinder.h
+++ b/Sample/HardParticle/FormFactorCylinder.h
@@ -39,7 +39,7 @@ public:
 
     double radialExtension() const override { return m_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorEllipsoidalCylinder.cpp b/Sample/HardParticle/FormFactorEllipsoidalCylinder.cpp
index b6d23b711e1fdeda3a53fc2d94ba85f1672d093f..f6612b4f643b13095b608c946f70f8722d96a7b9 100644
--- a/Sample/HardParticle/FormFactorEllipsoidalCylinder.cpp
+++ b/Sample/HardParticle/FormFactorEllipsoidalCylinder.cpp
@@ -43,7 +43,7 @@ double FormFactorEllipsoidalCylinder::radialExtension() const
     return (m_radius_x + m_radius_y) / 2.0;
 }
 
-complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(C3 q) const
+complex_t FormFactorEllipsoidalCylinder::formfactor(C3 q) const
 {
     complex_t qxRa = q.x() * m_radius_x;
     complex_t qyRb = q.y() * m_radius_y;
diff --git a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
index 9ca27bac7fb5722cbab57d9c29cce4b406b18fdb..fff0746f9d1f09b5b80ff7bf85cc2b70f2e7a43f 100644
--- a/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Sample/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -40,7 +40,7 @@ public:
 
     double radialExtension() const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorFullSphere.cpp b/Sample/HardParticle/FormFactorFullSphere.cpp
index 43e39886070afbcd0af2cd07f460cb9c136e98f4..6004656ecb60771433bace81a25577fc111bb92f 100644
--- a/Sample/HardParticle/FormFactorFullSphere.cpp
+++ b/Sample/HardParticle/FormFactorFullSphere.cpp
@@ -49,7 +49,7 @@ double FormFactorFullSphere::topZ(const IRotation& rotation) const
     return new_centre.z() + m_radius;
 }
 
-complex_t FormFactorFullSphere::evaluate_for_q(C3 q) const
+complex_t FormFactorFullSphere::formfactor(C3 q) const
 {
     complex_t ret = SampleUtils::someff::ffSphere(q, m_radius);
     if (!m_position_at_center)
diff --git a/Sample/HardParticle/FormFactorFullSphere.h b/Sample/HardParticle/FormFactorFullSphere.h
index b0f02aa0bbbf431b7f71539307ba65f008804462..ee72d7c3d42418b62e8df7e78d94d7a43e045984 100644
--- a/Sample/HardParticle/FormFactorFullSphere.h
+++ b/Sample/HardParticle/FormFactorFullSphere.h
@@ -42,7 +42,7 @@ public:
 
     double topZ(const IRotation& rotation) const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     bool canSliceAnalytically(const IRotation&) const override { return true; }
diff --git a/Sample/HardParticle/FormFactorFullSpheroid.cpp b/Sample/HardParticle/FormFactorFullSpheroid.cpp
index 218d96e2407e3678bca981b86d696348a200b67f..930d9763c0b0f01f3b8da1f7d1f38f45bef03fd8 100644
--- a/Sample/HardParticle/FormFactorFullSpheroid.cpp
+++ b/Sample/HardParticle/FormFactorFullSpheroid.cpp
@@ -37,7 +37,7 @@ FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)
 {
 }
 
-complex_t FormFactorFullSpheroid::evaluate_for_q(C3 q) const
+complex_t FormFactorFullSpheroid::formfactor(C3 q) const
 {
     double h = m_height / 2;
     double R = m_radius;
diff --git a/Sample/HardParticle/FormFactorFullSpheroid.h b/Sample/HardParticle/FormFactorFullSpheroid.h
index 1eca1ad93dc46f80708cbc20b85c301cc7bc7ab8..6d0ad86bc61475c149537728fc5a1a1a864e1068 100644
--- a/Sample/HardParticle/FormFactorFullSpheroid.h
+++ b/Sample/HardParticle/FormFactorFullSpheroid.h
@@ -39,7 +39,7 @@ public:
 
     double radialExtension() const override { return m_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorHemiEllipsoid.cpp b/Sample/HardParticle/FormFactorHemiEllipsoid.cpp
index 0351d7ae3a8714bbdd7d41ce059f9a0f8cd0daa5..86e43e06eb878c6ab22916bb4a6821ac462760b4 100644
--- a/Sample/HardParticle/FormFactorHemiEllipsoid.cpp
+++ b/Sample/HardParticle/FormFactorHemiEllipsoid.cpp
@@ -43,7 +43,7 @@ double FormFactorHemiEllipsoid::radialExtension() const
     return (m_radius_x + m_radius_y) / 2.0;
 }
 
-complex_t FormFactorHemiEllipsoid::evaluate_for_q(C3 q) const
+complex_t FormFactorHemiEllipsoid::formfactor(C3 q) const
 {
     double R = m_radius_x;
     double W = m_radius_y;
diff --git a/Sample/HardParticle/FormFactorHemiEllipsoid.h b/Sample/HardParticle/FormFactorHemiEllipsoid.h
index dbf55b21d959b8c529e88eea1024d3e3c26ee6da..4c38d41acd5c56faaed29cf74ab8ec464688c1ad 100644
--- a/Sample/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Sample/HardParticle/FormFactorHemiEllipsoid.h
@@ -42,7 +42,7 @@ public:
 
     double radialExtension() const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     void onChange() override;
diff --git a/Sample/HardParticle/FormFactorHollowSphere.cpp b/Sample/HardParticle/FormFactorHollowSphere.cpp
index dddc612791dadc516ee1e6aa9fc0a9d78b0cf73e..5c6b2f0f8d98cdf1d2d247f05a9a81de3613e15f 100644
--- a/Sample/HardParticle/FormFactorHollowSphere.cpp
+++ b/Sample/HardParticle/FormFactorHollowSphere.cpp
@@ -37,7 +37,7 @@ FormFactorHollowSphere::FormFactorHollowSphere(double mean, double full_width)
 {
 }
 
-complex_t FormFactorHollowSphere::evaluate_for_q(C3 q) const
+complex_t FormFactorHollowSphere::formfactor(C3 q) const
 {
     double R = m_mean;
     double W = m_full_width;
diff --git a/Sample/HardParticle/FormFactorHollowSphere.h b/Sample/HardParticle/FormFactorHollowSphere.h
index 9baaf58a661d40ac5a9c97bef9b2350d979929e5..35fef39fdc46fd405dc465e534d5c32e5af25b93 100644
--- a/Sample/HardParticle/FormFactorHollowSphere.h
+++ b/Sample/HardParticle/FormFactorHollowSphere.h
@@ -36,7 +36,7 @@ public:
 
     double radialExtension() const override { return m_mean; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     void onChange() override;
diff --git a/Sample/HardParticle/FormFactorLongBoxGauss.cpp b/Sample/HardParticle/FormFactorLongBoxGauss.cpp
index 1703031773b6b2e41274fa1d36a5f3aaa7edf163..dba39203f80471bced263f2eb98e39e823cfa1ea 100644
--- a/Sample/HardParticle/FormFactorLongBoxGauss.cpp
+++ b/Sample/HardParticle/FormFactorLongBoxGauss.cpp
@@ -35,7 +35,7 @@ FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, doub
 {
 }
 
-complex_t FormFactorLongBoxGauss::evaluate_for_q(C3 q) const
+complex_t FormFactorLongBoxGauss::formfactor(C3 q) const
 {
     complex_t qxL2 = std::pow(m_length * q.x(), 2) / 2.0;
     complex_t qyWdiv2 = m_width * q.y() / 2.0;
diff --git a/Sample/HardParticle/FormFactorLongBoxGauss.h b/Sample/HardParticle/FormFactorLongBoxGauss.h
index 4c1d5fa04f96e6ad632acda6305f5ebe755b6274..3951a9a98db33642d486951018108b4503ebf699 100644
--- a/Sample/HardParticle/FormFactorLongBoxGauss.h
+++ b/Sample/HardParticle/FormFactorLongBoxGauss.h
@@ -39,7 +39,7 @@ public:
     double getWidth() const { return m_width; }
     double radialExtension() const override { return m_length / 2.0; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorLongBoxLorentz.cpp b/Sample/HardParticle/FormFactorLongBoxLorentz.cpp
index 1d00f189e3a58af982cebd4c876c6c555761b357..21e929e2a18de6c20d26730f4ac832d5835f9598 100644
--- a/Sample/HardParticle/FormFactorLongBoxLorentz.cpp
+++ b/Sample/HardParticle/FormFactorLongBoxLorentz.cpp
@@ -35,7 +35,7 @@ FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width,
 {
 }
 
-complex_t FormFactorLongBoxLorentz::evaluate_for_q(C3 q) const
+complex_t FormFactorLongBoxLorentz::formfactor(C3 q) const
 {
     complex_t qxL2 = 2.5 * std::pow(m_length * q.x(), 2);
     complex_t qyWdiv2 = m_width * q.y() / 2.0;
diff --git a/Sample/HardParticle/FormFactorLongBoxLorentz.h b/Sample/HardParticle/FormFactorLongBoxLorentz.h
index 61edcb0345bf7e58e6c4b63050a7476d9c5b0d00..8845127961f95d6843dcb6c24ad7c58071cd7ba4 100644
--- a/Sample/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Sample/HardParticle/FormFactorLongBoxLorentz.h
@@ -40,7 +40,7 @@ public:
 
     double radialExtension() const override { return m_length / 2.0; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorTruncatedSphere.cpp b/Sample/HardParticle/FormFactorTruncatedSphere.cpp
index f28bce08bd2d721eb8f9014114af458bb5fff2a2..9d8a24e16554864a0e0ed198304912526e7e66b0 100644
--- a/Sample/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Sample/HardParticle/FormFactorTruncatedSphere.cpp
@@ -54,7 +54,7 @@ bool FormFactorTruncatedSphere::check_initialization() const
 }
 
 //! Complex form factor.
-complex_t FormFactorTruncatedSphere::evaluate_for_q(C3 q) const
+complex_t FormFactorTruncatedSphere::formfactor(C3 q) const
 {
     if (std::abs(q.mag()) < std::numeric_limits<double>::epsilon())
         return M_PI / 3.
diff --git a/Sample/HardParticle/FormFactorTruncatedSphere.h b/Sample/HardParticle/FormFactorTruncatedSphere.h
index c860c4ca0a87c54ced552e95ac92e7c6cc988305..2cf506621e1bc6a49a0ae9e5edf971b80c73776b 100644
--- a/Sample/HardParticle/FormFactorTruncatedSphere.h
+++ b/Sample/HardParticle/FormFactorTruncatedSphere.h
@@ -40,7 +40,7 @@ public:
 
     double radialExtension() const override { return m_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/FormFactorTruncatedSpheroid.cpp b/Sample/HardParticle/FormFactorTruncatedSpheroid.cpp
index b79c66049d819b68a71c9b4f354ac668732c8354..e7a713ced3d5beaa5b50140cbea352199be3bd0c 100644
--- a/Sample/HardParticle/FormFactorTruncatedSpheroid.cpp
+++ b/Sample/HardParticle/FormFactorTruncatedSpheroid.cpp
@@ -57,7 +57,7 @@ bool FormFactorTruncatedSpheroid::check_initialization() const
     return result;
 }
 
-complex_t FormFactorTruncatedSpheroid::evaluate_for_q(C3 q) const
+complex_t FormFactorTruncatedSpheroid::formfactor(C3 q) const
 {
     double H = m_height;
     double R = m_radius;
diff --git a/Sample/HardParticle/FormFactorTruncatedSpheroid.h b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
index 18bcbf57ec1ac758086d7f5c0f027318c67ba369..098820eceb41fbe8a75e596ab08e6b6e983747c4 100644
--- a/Sample/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Sample/HardParticle/FormFactorTruncatedSpheroid.h
@@ -42,7 +42,7 @@ public:
 
     double radialExtension() const override { return m_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     IFormFactor* sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Sample/HardParticle/IFormFactorPolyhedron.cpp b/Sample/HardParticle/IFormFactorPolyhedron.cpp
index 85ab2068bb2896a42556c4908fddce2ee79a77d6..54cda693682b95be710b51d09f8bbec2f52ecfd2 100644
--- a/Sample/HardParticle/IFormFactorPolyhedron.cpp
+++ b/Sample/HardParticle/IFormFactorPolyhedron.cpp
@@ -54,9 +54,9 @@ double IFormFactorPolyhedron::topZ(const IRotation& rotation) const
     return TopZ(pimpl->vertices(), rotation);
 }
 
-complex_t IFormFactorPolyhedron::evaluate_for_q(C3 q) const
+complex_t IFormFactorPolyhedron::formfactor(C3 q) const
 {
-    return pimpl->evaluate_for_q(q);
+    return pimpl->formfactor(q);
 }
 
 double IFormFactorPolyhedron::volume() const
diff --git a/Sample/HardParticle/IFormFactorPolyhedron.h b/Sample/HardParticle/IFormFactorPolyhedron.h
index b499bdbca82dab65c8d85128c52a0fa87949d738..36907af933eafe238bbed257f3e7826330efd574 100644
--- a/Sample/HardParticle/IFormFactorPolyhedron.h
+++ b/Sample/HardParticle/IFormFactorPolyhedron.h
@@ -39,7 +39,7 @@ public:
     double bottomZ(const IRotation& rotation) const override;
     double topZ(const IRotation& rotation) const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
     double volume() const override;
     double radialExtension() const override;
diff --git a/Sample/HardParticle/IFormFactorPrism.cpp b/Sample/HardParticle/IFormFactorPrism.cpp
index 7232961174a007df801c035503e6b59118dc95b8..408feeecadb510467d97876c13add49f8b549ce5 100644
--- a/Sample/HardParticle/IFormFactorPrism.cpp
+++ b/Sample/HardParticle/IFormFactorPrism.cpp
@@ -54,7 +54,7 @@ double IFormFactorPrism::radialExtension() const
 
 //! Returns the form factor F(q) of this polyhedron, respecting the offset height/2.
 
-complex_t IFormFactorPrism::evaluate_for_q(C3 q) const
+complex_t IFormFactorPrism::formfactor(C3 q) const
 {
-    return pimpl->evaluate_for_q(q);
+    return pimpl->formfactor(q);
 }
diff --git a/Sample/HardParticle/IFormFactorPrism.h b/Sample/HardParticle/IFormFactorPrism.h
index 72d29eb5211cfe00599e1ffa3f0f6e4ff99d7f16..8160122e58fb25eb90f2849f068bdb6a12aa332c 100644
--- a/Sample/HardParticle/IFormFactorPrism.h
+++ b/Sample/HardParticle/IFormFactorPrism.h
@@ -36,7 +36,7 @@ public:
     double bottomZ(const IRotation& rotation) const override;
     double topZ(const IRotation& rotation) const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
     double volume() const override;
     double radialExtension() const override;
     double getHeight() const;
diff --git a/Sample/HardParticle/IProfileRipple.cpp b/Sample/HardParticle/IProfileRipple.cpp
index 1d255b3de70d203db37e04bcec77469fcf5c8079..ce3635d1c8e5b179dabc309b6e8c782765ade58f 100644
--- a/Sample/HardParticle/IProfileRipple.cpp
+++ b/Sample/HardParticle/IProfileRipple.cpp
@@ -39,7 +39,7 @@ double IProfileRipple::radialExtension() const
     return (m_width + m_length) / 4.0;
 }
 
-complex_t IProfileRipple::evaluate_for_q(C3 q) const
+complex_t IProfileRipple::formfactor(C3 q) const
 {
     return factor_x(q.x()) * factor_yz(q.y(), q.z());
 }
diff --git a/Sample/HardParticle/IProfileRipple.h b/Sample/HardParticle/IProfileRipple.h
index 64068fec789829b1b67ffa46360982ea493b5f02..5a043dfffb881788a0dbc57a37e6013191fa09cb 100644
--- a/Sample/HardParticle/IProfileRipple.h
+++ b/Sample/HardParticle/IProfileRipple.h
@@ -30,7 +30,7 @@ public:
 
     double radialExtension() const override;
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     const double& m_length;
diff --git a/Sample/Scattering/IBornFF.cpp b/Sample/Scattering/IBornFF.cpp
index 7e0548badc1f1b322da8ba46092793b7a9dd21c9..3bf9d3f912b0b4c45e3e7a286cef46bdf346deaa 100644
--- a/Sample/Scattering/IBornFF.cpp
+++ b/Sample/Scattering/IBornFF.cpp
@@ -30,12 +30,12 @@ IBornFF::~IBornFF() = default;
 
 complex_t IBornFF::theFF(const WavevectorInfo& wavevectors) const
 {
-    return evaluate_for_q(wavevectors.getQ());
+    return formfactor(wavevectors.getQ());
 }
 
 Eigen::Matrix2cd IBornFF::thePolFF(const WavevectorInfo& wavevectors) const
 {
-    return evaluate_for_q_pol(wavevectors.getQ());
+    return formfactor_pol(wavevectors.getQ());
 }
 
 double IBornFF::bottomZ(const IRotation& rotation) const
@@ -57,9 +57,9 @@ bool IBornFF::canSliceAnalytically(const IRotation& rot) const
     return rot.zInvariant();
 }
 
-Eigen::Matrix2cd IBornFF::evaluate_for_q_pol(C3 q) const
+Eigen::Matrix2cd IBornFF::formfactor_pol(C3 q) const
 {
-    return evaluate_for_q(q) * Eigen::Matrix2cd::Identity();
+    return formfactor(q) * Eigen::Matrix2cd::Identity();
 }
 
 SlicingEffects IBornFF::computeSlicingEffects(ZLimits limits, const R3& position, double height)
diff --git a/Sample/Scattering/IBornFF.h b/Sample/Scattering/IBornFF.h
index ed3339b692f7508f5b64d1b9fd3895bc2e19b4ec..2a93766b18b53bb310397ff6c9a3f4b829efeb46 100644
--- a/Sample/Scattering/IBornFF.h
+++ b/Sample/Scattering/IBornFF.h
@@ -55,7 +55,7 @@ public:
 
     //! Returns scattering amplitude for complex scattering wavevector q=k_i-k_f.
     //! This method is public only for convenience of plotting form factors in Python.
-    virtual complex_t evaluate_for_q(C3 q) const = 0;
+    virtual complex_t formfactor(C3 q) const = 0;
 
 protected:
     //! Default implementation only allows rotations along z-axis
@@ -63,9 +63,9 @@ protected:
 
 #ifndef SWIG
     //! Returns scattering amplitude for complex scattering wavevector q=k_i-k_f in case
-    //! of matrix interactions. Default implementation calls evaluate_for_q(q) and
+    //! of matrix interactions. Default implementation calls formfactor(q) and
     //! multiplies with the unit matrix.
-    virtual Eigen::Matrix2cd evaluate_for_q_pol(C3 q) const;
+    virtual Eigen::Matrix2cd formfactor_pol(C3 q) const;
 #endif
 
     //! IShape3D object, used to retrieve vertices (which may be approximate in the case
diff --git a/Sample/SoftParticle/FormFactorGauss.cpp b/Sample/SoftParticle/FormFactorGauss.cpp
index 8900bb5dabfa93d1a17e83d69bf5a8a34c9693c1..ee491f0f17acc4f90e1c8ebbb0f587eea1b50e52 100644
--- a/Sample/SoftParticle/FormFactorGauss.cpp
+++ b/Sample/SoftParticle/FormFactorGauss.cpp
@@ -32,7 +32,7 @@ FormFactorGaussSphere::FormFactorGaussSphere(double mean_radius)
 {
 }
 
-complex_t FormFactorGaussSphere::evaluate_for_q(C3 q) const
+complex_t FormFactorGaussSphere::formfactor(C3 q) const
 {
     const double max_ql = std::sqrt(-4 * M_PI * std::log(std::numeric_limits<double>::min()) / 3);
 
diff --git a/Sample/SoftParticle/FormFactorGauss.h b/Sample/SoftParticle/FormFactorGauss.h
index b00803b290c76b2a13ab4c15174c5a83e23a4270..2b3b721f4ca3432ebb6929a30a662f0f63e22047 100644
--- a/Sample/SoftParticle/FormFactorGauss.h
+++ b/Sample/SoftParticle/FormFactorGauss.h
@@ -38,7 +38,7 @@ public:
 
     double radialExtension() const override { return m_mean_radius; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     void onChange() override{};
diff --git a/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
index e9e6e06e2cfef6b4e85895ad351527fdb1247420..d8929d2146c259442f7fbe4b838ad688f1a5531b 100644
--- a/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -34,7 +34,7 @@ FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, doub
 {
 }
 
-complex_t FormFactorSphereGaussianRadius::evaluate_for_q(C3 q) const
+complex_t FormFactorSphereGaussianRadius::formfactor(C3 q) const
 {
     double q2 = std::norm(q.x()) + std::norm(q.y()) + std::norm(q.z());
     double dw = std::exp(-q2 * m_sigma * m_sigma / 2.0);
diff --git a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
index 11b5e028ff17ec113b728f914c8d8cb730ac232b..c23e56dfcaadccc1a19a7dca904a86be01113fc4 100644
--- a/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -38,7 +38,7 @@ public:
 
     double radialExtension() const override { return m_mean; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 protected:
     void onChange() override;
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 178e3334143fad4ec3310470ade226b121ab03a5..b0480848613dbd46c22fc043f57da6dc937c02ad 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -52,7 +52,7 @@ FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const
     return new FormFactorSphereLogNormalRadius(m_mean, m_scale_param, m_n_samples);
 }
 
-complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(C3 q) const
+complex_t FormFactorSphereLogNormalRadius::formfactor(C3 q) const
 {
     complex_t result = 0;
     for (size_t i = 0; i < m_radii.size(); ++i)
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
index 5bb225be0139e2739b6809036ac877e313d7e332..4bf9d20bfe14f0e23b1d43adb17ac3b2ee6f6b43 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -35,7 +35,7 @@ public:
 
     double radialExtension() const override { return m_mean; }
 
-    complex_t evaluate_for_q(C3 q) const override;
+    complex_t formfactor(C3 q) const override;
 
 #ifndef SWIG
     std::string pythonConstructor() const override;
diff --git a/Sample/ff/Polyhedron.cpp b/Sample/ff/Polyhedron.cpp
index 684e1be305ad3cc68c46d8040e40770061bb16db..1006ad32890b8a93b44258f5e5339e8b9af3a9b7 100644
--- a/Sample/ff/Polyhedron.cpp
+++ b/Sample/ff/Polyhedron.cpp
@@ -113,7 +113,7 @@ const std::vector<R3> ff::Polyhedron::vertices() const
 
 //! Returns the form factor F(q) of this polyhedron, respecting the offset z_bottom.
 
-complex_t ff::Polyhedron::evaluate_for_q(const C3& _q) const
+complex_t ff::Polyhedron::formfactor(const C3& _q) const
 {
     C3 q{_q};
     return exp_I(-m_z_bottom * q.z()) * evaluate_centered(q);
diff --git a/Sample/ff/Polyhedron.h b/Sample/ff/Polyhedron.h
index 3107e2d44826d5c93ab454d9f4257a983190756d..83f79f0d51d17bcc415bef85b120a7ba3c625b77 100644
--- a/Sample/ff/Polyhedron.h
+++ b/Sample/ff/Polyhedron.h
@@ -45,7 +45,7 @@ public:
     double radius() const;
 
     const std::vector<R3> vertices() const; //! needed for topZ, bottomZ computation
-    complex_t evaluate_for_q(const C3& q) const;
+    complex_t formfactor(const C3& q) const;
 
 private:
     complex_t evaluate_centered(const C3& q) const;
diff --git a/Sample/ff/Prism.cpp b/Sample/ff/Prism.cpp
index 4b420c982f1e2cc8acdd16fd416fbddddbe670f7..69fa5720a16cd480ca9c082b38e6b8297f01841d 100644
--- a/Sample/ff/Prism.cpp
+++ b/Sample/ff/Prism.cpp
@@ -52,7 +52,7 @@ const std::vector<R3>& ff::Prism::vertices() const
     return m_vertices;
 }
 
-complex_t ff::Prism::evaluate_for_q(const C3& q) const
+complex_t ff::Prism::formfactor(const C3& q) const
 {
     try {
 #ifdef ALGORITHM_DIAGNOSTIC
diff --git a/Sample/ff/Prism.h b/Sample/ff/Prism.h
index aeed0e29906e49291a2a1ab0084ef0263ec5552c..746615cb94321839a4663e535133cf4c19038c48 100644
--- a/Sample/ff/Prism.h
+++ b/Sample/ff/Prism.h
@@ -33,7 +33,7 @@ public:
 
     double area() const;
     const std::vector<R3>& vertices() const; //! needed for topZ, bottomZ computation
-    complex_t evaluate_for_q(const C3& q) const;
+    complex_t formfactor(const C3& q) const;
 
 private:
     std::unique_ptr<ff::PolyhedralFace> m_base;
diff --git a/Tests/SingleUse/ff-tetrahedron.cpp b/Tests/SingleUse/ff-tetrahedron.cpp
index bb627f25b83a53d92a657fc8dd42c253bd8454bc..946c21e4f7a2f0a3abdbeda28f542bb393fe085d 100644
--- a/Tests/SingleUse/ff-tetrahedron.cpp
+++ b/Tests/SingleUse/ff-tetrahedron.cpp
@@ -16,13 +16,13 @@
 
 void run(const IBornFF& ff, const C3& q, const C3& p)
 {
-    const complex_t ffq = ff.evaluate_for_q(q);
+    const complex_t ffq = ff.formfactor(q);
     std::cout << std::setprecision(16) << q << " -> " << ffq << "\n";
 #ifdef ALGORITHM_DIAGNOSTIC
     std::cout << polyhedralDiagnosis.message() << "\n";
     polyhedralDiagnosis.reset();
 #endif
-    const complex_t ffp = ff.evaluate_for_q(p);
+    const complex_t ffp = ff.formfactor(p);
     std::cout << std::setprecision(16) << p << " -> " << ffp << "\n";
 #ifdef ALGORITHM_DIAGNOSTIC
     std::cout << polyhedralDiagnosis.message() << "\n";
diff --git a/Tests/Unit/Numeric/BisectFF.cpp b/Tests/Unit/Numeric/BisectFF.cpp
index 6593756832c3c70a8e903bceef7d78c4cb0bb043..e2d22779f90c3886b6f51532d0a0966cfa4c4c17 100644
--- a/Tests/Unit/Numeric/BisectFF.cpp
+++ b/Tests/Unit/Numeric/BisectFF.cpp
@@ -24,8 +24,8 @@
 complex_t deriv(const IBornFF& ff, const C3& qf, const complex_t Ff,
                 const PolyhedralDiagnosis& /*df*/, const C3& qdir, const double qstep)
 {
-    assert(Ff == ff.evaluate_for_q(qf));
-    complex_t Fi = ff.evaluate_for_q(qf + qstep * qdir);
+    assert(Ff == ff.formfactor(qf));
+    complex_t Fi = ff.formfactor(qf + qstep * qdir);
     PolyhedralDiagnosis di = polyhedralDiagnosis;
     // assert(di==df);
     return (Ff - Fi) / qstep;
@@ -76,7 +76,7 @@ void bisect(int& ifail, const C3& qdir, const IBornFF& ff, const C3& q0, const C
         return;
     }
     C3 q2 = (q0 + q1) / 2.;
-    complex_t F2 = ff.evaluate_for_q(q2);
+    complex_t F2 = ff.formfactor(q2);
     PolyhedralDiagnosis d2 = polyhedralDiagnosis;
     if (d2 != d0)
         bisect(ifail, qdir, ff, q0, q2, F0, F2, d0, d2, qmindiff, Fmaxreldiff);
@@ -87,9 +87,9 @@ void bisect(int& ifail, const C3& qdir, const IBornFF& ff, const C3& q0, const C
 void run_bisection(int& ifail, IBornFF& ff, const C3& q0, const C3& q1)
 {
     const double qdiffmin = std::max(q0.mag(), q1.mag()) / 4e11;
-    complex_t F0 = ff.evaluate_for_q(q0);
+    complex_t F0 = ff.formfactor(q0);
     PolyhedralDiagnosis d0 = polyhedralDiagnosis;
-    complex_t F1 = ff.evaluate_for_q(q1);
+    complex_t F1 = ff.formfactor(q1);
     PolyhedralDiagnosis d1 = polyhedralDiagnosis;
 
     if (d0 == d1)
diff --git a/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
index 969198eb0907686a27d50aa77c96a14a5317ba17..ccdb0973226dee156a5a91d70a4039a0f8129647 100644
--- a/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
+++ b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
@@ -17,8 +17,8 @@ protected:
 private:
     void test_ff_eq(C3 q, IBornFF* p0, IBornFF* p1, double eps)
     {
-        const complex_t f0 = p0->evaluate_for_q(q);
-        const complex_t f1 = p1->evaluate_for_q(q);
+        const complex_t f0 = p0->formfactor(q);
+        const complex_t f1 = p1->formfactor(q);
         const double avge = (std::abs(f0) + std::abs(f1)) / 2;
         const double precision = std::max(1e-16, eps * avge);
         EXPECT_NEAR(real(f0), real(f1), precision) << "q=" << q << "\n"
diff --git a/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
index 283348d77fb0dadae68c5f5df3c052d9bebd69e3..0b8917cadff4a9e4290ca569ed19de0b96ef0fb3 100644
--- a/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
+++ b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
@@ -12,11 +12,11 @@ private:
 
     void test_qq_eq(IBornFF* ff, C3 q, C3 p, double eps)
     {
-        complex_t f0 = ff->evaluate_for_q(q);
+        complex_t f0 = ff->formfactor(q);
 #ifdef ALGORITHM_DIAGNOSTIC
         std::string msg0 = polyhedralDiagnosis.message();
 #endif
-        const complex_t f1 = ff->evaluate_for_q(p);
+        const complex_t f1 = ff->formfactor(p);
         const double avge = (std::abs(f0) + std::abs(f1)) / 2;
         const double precision = std::max(1e-16, eps * avge);
         EXPECT_NEAR(real(f0), real(f1), precision)
diff --git a/Tests/Unit/Sample/FormFactorBasicTest.cpp b/Tests/Unit/Sample/FormFactorBasicTest.cpp
index 2ee9b2a2655dba9acdd2b6e9895c08609bd3d1a3..a4922b6cccc648f7eedeac0b03afd2a5c5e1d403 100644
--- a/Tests/Unit/Sample/FormFactorBasicTest.cpp
+++ b/Tests/Unit/Sample/FormFactorBasicTest.cpp
@@ -9,7 +9,7 @@ protected:
     void test_eps_q(const IBornFF* p, C3 qdir, double eps) const
     {
         C3 q = eps * qdir;
-        complex_t ff = p->evaluate_for_q(q);
+        complex_t ff = p->formfactor(q);
         // std::cout<<"q="<<q<<" -> "<<std::setprecision(16)<<" ff0="<<V<<", ff ="<<ff<<"\n";
         EXPECT_LE(real(ff), V * (1 + 4e-16));
         if (R * R * R < V / 20 || R * R * R > 20 * V)
@@ -28,7 +28,7 @@ protected:
     }
     void test_ff(const IBornFF* p)
     {
-        complex_t ff0 = p->evaluate_for_q(C3(0., 0., 0.));
+        complex_t ff0 = p->formfactor(C3(0., 0., 0.));
         EXPECT_EQ(imag(ff0), 0.);
         V = real(ff0);
         EXPECT_NEAR(p->volume(), V, 3e-16 * V);
@@ -57,7 +57,7 @@ protected:
         IBornFF* clone = p->clone();
         EXPECT_EQ(clone->volume(), V);
         C3 q(.1, .2, complex_t(.3, .004));
-        EXPECT_EQ(clone->evaluate_for_q(q), p->evaluate_for_q(q));
+        EXPECT_EQ(clone->formfactor(q), p->formfactor(q));
         delete clone;
     }
     double V, R;
diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i
index d7c18c04318e587927930b1f111a00af2a71ac31..4ab3c6281862e7b60b90cf4596c030ef04dead24 100644
--- a/auto/Wrap/doxygenSample.i
+++ b/auto/Wrap/doxygenSample.i
@@ -419,7 +419,7 @@ Returns the total volume of the particle of this form factor's shape.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorBox::evaluate_for_q "complex_t FormFactorBox::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorBox::formfactor "complex_t FormFactorBox::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -508,7 +508,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorCone::evaluate_for_q "complex_t FormFactorCone::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorCone::formfactor "complex_t FormFactorCone::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -820,7 +820,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorCylinder::evaluate_for_q "complex_t FormFactorCylinder::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorCylinder::formfactor "complex_t FormFactorCylinder::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1028,7 +1028,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorEllipsoidalCylinder::evaluate_for_q "complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorEllipsoidalCylinder::formfactor "complex_t FormFactorEllipsoidalCylinder::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1077,7 +1077,7 @@ Returns the z-coordinate of the lowest point in this shape after a given rotatio
 Returns the z-coordinate of the lowest point in this shape after a given rotation. 
 ";
 
-%feature("docstring")  FormFactorFullSphere::evaluate_for_q "complex_t FormFactorFullSphere::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorFullSphere::formfactor "complex_t FormFactorFullSphere::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1119,7 +1119,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorFullSpheroid::evaluate_for_q "complex_t FormFactorFullSpheroid::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorFullSpheroid::formfactor "complex_t FormFactorFullSpheroid::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1158,7 +1158,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorGaussSphere::evaluate_for_q "complex_t FormFactorGaussSphere::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorGaussSphere::formfactor "complex_t FormFactorGaussSphere::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1206,7 +1206,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorHemiEllipsoid::evaluate_for_q "complex_t FormFactorHemiEllipsoid::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorHemiEllipsoid::formfactor "complex_t FormFactorHemiEllipsoid::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1242,7 +1242,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorHollowSphere::evaluate_for_q "complex_t FormFactorHollowSphere::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorHollowSphere::formfactor "complex_t FormFactorHollowSphere::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1316,7 +1316,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorLongBoxGauss::evaluate_for_q "complex_t FormFactorLongBoxGauss::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorLongBoxGauss::formfactor "complex_t FormFactorLongBoxGauss::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1361,7 +1361,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorLongBoxLorentz::evaluate_for_q "complex_t FormFactorLongBoxLorentz::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorLongBoxLorentz::formfactor "complex_t FormFactorLongBoxLorentz::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1568,7 +1568,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorSphereGaussianRadius::evaluate_for_q "complex_t FormFactorSphereGaussianRadius::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorSphereGaussianRadius::formfactor "complex_t FormFactorSphereGaussianRadius::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1604,7 +1604,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorSphereLogNormalRadius::evaluate_for_q "complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorSphereLogNormalRadius::formfactor "complex_t FormFactorSphereLogNormalRadius::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -1721,7 +1721,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorTruncatedSphere::evaluate_for_q "complex_t FormFactorTruncatedSphere::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorTruncatedSphere::formfactor "complex_t FormFactorTruncatedSphere::formfactor(C3 q) const override
 
 Complex form factor. 
 ";
@@ -1769,7 +1769,7 @@ Returns a clone of this  ISampleNode object.
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  FormFactorTruncatedSpheroid::evaluate_for_q "complex_t FormFactorTruncatedSpheroid::evaluate_for_q(C3 q) const override
+%feature("docstring")  FormFactorTruncatedSpheroid::formfactor "complex_t FormFactorTruncatedSpheroid::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -2575,7 +2575,7 @@ Returns the z-coordinate of the lowest point in this shape after a given rotatio
 Returns the z-coordinate of the lowest point in this shape after a given rotation. 
 ";
 
-%feature("docstring")  IBornFF::evaluate_for_q "virtual complex_t IBornFF::evaluate_for_q(C3 q) const =0
+%feature("docstring")  IBornFF::formfactor "virtual complex_t IBornFF::formfactor(C3 q) const =0
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -2798,7 +2798,7 @@ Returns the z-coordinate of the lowest point in this shape after a given rotatio
 Returns the z-coordinate of the lowest point in this shape after a given rotation. 
 ";
 
-%feature("docstring")  IFormFactorPolyhedron::evaluate_for_q "complex_t IFormFactorPolyhedron::evaluate_for_q(C3 q) const override
+%feature("docstring")  IFormFactorPolyhedron::formfactor "complex_t IFormFactorPolyhedron::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -2843,7 +2843,7 @@ Returns the z-coordinate of the lowest point in this shape after a given rotatio
 Returns the z-coordinate of the lowest point in this shape after a given rotation. 
 ";
 
-%feature("docstring")  IFormFactorPrism::evaluate_for_q "complex_t IFormFactorPrism::evaluate_for_q(C3 q) const override
+%feature("docstring")  IFormFactorPrism::formfactor "complex_t IFormFactorPrism::formfactor(C3 q) const override
 
 Returns the form factor F(q) of this polyhedron, respecting the offset height/2. 
 ";
@@ -3865,7 +3865,7 @@ C++ includes: IProfileRipple.h
 Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 ";
 
-%feature("docstring")  IProfileRipple::evaluate_for_q "complex_t IProfileRipple::evaluate_for_q(C3 q) const override
+%feature("docstring")  IProfileRipple::formfactor "complex_t IProfileRipple::formfactor(C3 q) const override
 
 Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 ";
@@ -5186,7 +5186,7 @@ C++ includes: Polyhedron.h
 %feature("docstring")  ff::Polyhedron::vertices "const std::vector< R3 > ff::Polyhedron::vertices() const
 ";
 
-%feature("docstring")  ff::Polyhedron::evaluate_for_q "complex_t ff::Polyhedron::evaluate_for_q(const C3 &q) const
+%feature("docstring")  ff::Polyhedron::formfactor "complex_t ff::Polyhedron::formfactor(const C3 &q) const
 
 needed for topZ, bottomZ computation
 
@@ -5211,7 +5211,7 @@ The mathematics implemented here is described in full detail in a paper by Joach
 %feature("docstring")  ff::Prism::vertices "const std::vector< R3 > & ff::Prism::vertices() const
 ";
 
-%feature("docstring")  ff::Prism::evaluate_for_q "complex_t ff::Prism::evaluate_for_q(const C3 &q) const
+%feature("docstring")  ff::Prism::formfactor "complex_t ff::Prism::formfactor(const C3 &q) const
 
 needed for topZ, bottomZ computation 
 ";
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index 6d890076877194dd1206b2db103313d9cc707da8..3fb20854a6f3806391c1e36d49e1c3dfb9a881a6 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -3449,15 +3449,15 @@ class IBornFF(IFormFactor):
         """
         return _libBornAgainSample.IBornFF_topZ(self, rotation)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(IBornFF self, C3 q) -> complex_t
-        virtual complex_t IBornFF::evaluate_for_q(C3 q) const =0
+        formfactor(IBornFF self, C3 q) -> complex_t
+        virtual complex_t IBornFF::formfactor(C3 q) const =0
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.IBornFF_evaluate_for_q(self, q)
+        return _libBornAgainSample.IBornFF_formfactor(self, q)
 
     def canSliceAnalytically(self, rot):
         r"""canSliceAnalytically(IBornFF self, IRotation rot) -> bool"""
@@ -8876,15 +8876,15 @@ class IFormFactorPolyhedron(IBornFF):
         """
         return _libBornAgainSample.IFormFactorPolyhedron_topZ(self, rotation)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(IFormFactorPolyhedron self, C3 q) -> complex_t
-        complex_t IFormFactorPolyhedron::evaluate_for_q(C3 q) const override
+        formfactor(IFormFactorPolyhedron self, C3 q) -> complex_t
+        complex_t IFormFactorPolyhedron::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.IFormFactorPolyhedron_evaluate_for_q(self, q)
+        return _libBornAgainSample.IFormFactorPolyhedron_formfactor(self, q)
 
     def volume(self):
         r"""
@@ -8956,15 +8956,15 @@ class IFormFactorPrism(IBornFF):
         """
         return _libBornAgainSample.IFormFactorPrism_topZ(self, rotation)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(IFormFactorPrism self, C3 q) -> complex_t
-        complex_t IFormFactorPrism::evaluate_for_q(C3 q) const override
+        formfactor(IFormFactorPrism self, C3 q) -> complex_t
+        complex_t IFormFactorPrism::formfactor(C3 q) const override
 
         Returns the form factor F(q) of this polyhedron, respecting the offset height/2. 
 
         """
-        return _libBornAgainSample.IFormFactorPrism_evaluate_for_q(self, q)
+        return _libBornAgainSample.IFormFactorPrism_formfactor(self, q)
 
     def volume(self):
         r"""
@@ -9047,15 +9047,15 @@ class IProfileRipple(IBornFF):
         """
         return _libBornAgainSample.IProfileRipple_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(IProfileRipple self, C3 q) -> complex_t
-        complex_t IProfileRipple::evaluate_for_q(C3 q) const override
+        formfactor(IProfileRipple self, C3 q) -> complex_t
+        complex_t IProfileRipple::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.IProfileRipple_evaluate_for_q(self, q)
+        return _libBornAgainSample.IProfileRipple_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_IProfileRipple
 
 # Register IProfileRipple in _libBornAgainSample:
@@ -9301,15 +9301,15 @@ class FormFactorBox(IFormFactorPrism):
         """
         return _libBornAgainSample.FormFactorBox_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorBox self, C3 q) -> complex_t
-        complex_t FormFactorBox::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorBox self, C3 q) -> complex_t
+        complex_t FormFactorBox::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorBox_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorBox_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorBox
 
 # Register FormFactorBox in _libBornAgainSample:
@@ -9469,15 +9469,15 @@ class FormFactorCone(IBornFF):
         """
         return _libBornAgainSample.FormFactorCone_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorCone self, C3 q) -> complex_t
-        complex_t FormFactorCone::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorCone self, C3 q) -> complex_t
+        complex_t FormFactorCone::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorCone_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorCone_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorCone
 
 # Register FormFactorCone in _libBornAgainSample:
@@ -9885,15 +9885,15 @@ class FormFactorCylinder(IBornFF):
         """
         return _libBornAgainSample.FormFactorCylinder_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorCylinder self, C3 q) -> complex_t
-        complex_t FormFactorCylinder::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorCylinder self, C3 q) -> complex_t
+        complex_t FormFactorCylinder::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorCylinder_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorCylinder_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorCylinder
 
 # Register FormFactorCylinder in _libBornAgainSample:
@@ -10045,15 +10045,15 @@ class FormFactorEllipsoidalCylinder(IBornFF):
         """
         return _libBornAgainSample.FormFactorEllipsoidalCylinder_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorEllipsoidalCylinder self, C3 q) -> complex_t
-        complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorEllipsoidalCylinder self, C3 q) -> complex_t
+        complex_t FormFactorEllipsoidalCylinder::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorEllipsoidalCylinder_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorEllipsoidalCylinder_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorEllipsoidalCylinder
 
 # Register FormFactorEllipsoidalCylinder in _libBornAgainSample:
@@ -10147,15 +10147,15 @@ class FormFactorFullSphere(IBornFF):
         """
         return _libBornAgainSample.FormFactorFullSphere_topZ(self, rotation)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorFullSphere self, C3 q) -> complex_t
-        complex_t FormFactorFullSphere::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorFullSphere self, C3 q) -> complex_t
+        complex_t FormFactorFullSphere::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorFullSphere_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorFullSphere_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorFullSphere
 
 # Register FormFactorFullSphere in _libBornAgainSample:
@@ -10237,15 +10237,15 @@ class FormFactorFullSpheroid(IBornFF):
         """
         return _libBornAgainSample.FormFactorFullSpheroid_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorFullSpheroid self, C3 q) -> complex_t
-        complex_t FormFactorFullSpheroid::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorFullSpheroid self, C3 q) -> complex_t
+        complex_t FormFactorFullSpheroid::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorFullSpheroid_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorFullSpheroid_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorFullSpheroid
 
 # Register FormFactorFullSpheroid in _libBornAgainSample:
@@ -10336,15 +10336,15 @@ class FormFactorHemiEllipsoid(IBornFF):
         """
         return _libBornAgainSample.FormFactorHemiEllipsoid_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorHemiEllipsoid self, C3 q) -> complex_t
-        complex_t FormFactorHemiEllipsoid::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorHemiEllipsoid self, C3 q) -> complex_t
+        complex_t FormFactorHemiEllipsoid::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorHemiEllipsoid_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorHemiEllipsoid_formfactor(self, q)
 
 # Register FormFactorHemiEllipsoid in _libBornAgainSample:
 _libBornAgainSample.FormFactorHemiEllipsoid_swigregister(FormFactorHemiEllipsoid)
@@ -10409,15 +10409,15 @@ class FormFactorHollowSphere(IBornFF):
         """
         return _libBornAgainSample.FormFactorHollowSphere_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorHollowSphere self, C3 q) -> complex_t
-        complex_t FormFactorHollowSphere::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorHollowSphere self, C3 q) -> complex_t
+        complex_t FormFactorHollowSphere::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorHollowSphere_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorHollowSphere_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorHollowSphere
 
 # Register FormFactorHollowSphere in _libBornAgainSample:
@@ -10569,15 +10569,15 @@ class FormFactorLongBoxGauss(IBornFF):
         """
         return _libBornAgainSample.FormFactorLongBoxGauss_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorLongBoxGauss self, C3 q) -> complex_t
-        complex_t FormFactorLongBoxGauss::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorLongBoxGauss self, C3 q) -> complex_t
+        complex_t FormFactorLongBoxGauss::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorLongBoxGauss_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorLongBoxGauss_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorLongBoxGauss
 
 # Register FormFactorLongBoxGauss in _libBornAgainSample:
@@ -10667,15 +10667,15 @@ class FormFactorLongBoxLorentz(IBornFF):
         """
         return _libBornAgainSample.FormFactorLongBoxLorentz_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorLongBoxLorentz self, C3 q) -> complex_t
-        complex_t FormFactorLongBoxLorentz::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorLongBoxLorentz self, C3 q) -> complex_t
+        complex_t FormFactorLongBoxLorentz::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorLongBoxLorentz_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorLongBoxLorentz_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorLongBoxLorentz
 
 # Register FormFactorLongBoxLorentz in _libBornAgainSample:
@@ -11277,15 +11277,15 @@ class FormFactorTruncatedSphere(IBornFF):
         """
         return _libBornAgainSample.FormFactorTruncatedSphere_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorTruncatedSphere self, C3 q) -> complex_t
-        complex_t FormFactorTruncatedSphere::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorTruncatedSphere self, C3 q) -> complex_t
+        complex_t FormFactorTruncatedSphere::formfactor(C3 q) const override
 
         Complex form factor. 
 
         """
-        return _libBornAgainSample.FormFactorTruncatedSphere_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorTruncatedSphere_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorTruncatedSphere
 
 # Register FormFactorTruncatedSphere in _libBornAgainSample:
@@ -11383,15 +11383,15 @@ class FormFactorTruncatedSpheroid(IBornFF):
         """
         return _libBornAgainSample.FormFactorTruncatedSpheroid_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorTruncatedSpheroid self, C3 q) -> complex_t
-        complex_t FormFactorTruncatedSpheroid::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorTruncatedSpheroid self, C3 q) -> complex_t
+        complex_t FormFactorTruncatedSpheroid::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorTruncatedSpheroid_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorTruncatedSpheroid_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorTruncatedSpheroid
 
 # Register FormFactorTruncatedSpheroid in _libBornAgainSample:
@@ -11465,15 +11465,15 @@ class FormFactorGaussSphere(IBornFF):
         """
         return _libBornAgainSample.FormFactorGaussSphere_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorGaussSphere self, C3 q) -> complex_t
-        complex_t FormFactorGaussSphere::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorGaussSphere self, C3 q) -> complex_t
+        complex_t FormFactorGaussSphere::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorGaussSphere_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorGaussSphere_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorGaussSphere
 
 # Register FormFactorGaussSphere in _libBornAgainSample:
@@ -11539,15 +11539,15 @@ class FormFactorSphereGaussianRadius(IBornFF):
         """
         return _libBornAgainSample.FormFactorSphereGaussianRadius_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorSphereGaussianRadius self, C3 q) -> complex_t
-        complex_t FormFactorSphereGaussianRadius::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorSphereGaussianRadius self, C3 q) -> complex_t
+        complex_t FormFactorSphereGaussianRadius::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorSphereGaussianRadius_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorSphereGaussianRadius_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorSphereGaussianRadius
 
 # Register FormFactorSphereGaussianRadius in _libBornAgainSample:
@@ -11613,15 +11613,15 @@ class FormFactorSphereLogNormalRadius(IBornFF):
         """
         return _libBornAgainSample.FormFactorSphereLogNormalRadius_radialExtension(self)
 
-    def evaluate_for_q(self, q):
+    def formfactor(self, q):
         r"""
-        evaluate_for_q(FormFactorSphereLogNormalRadius self, C3 q) -> complex_t
-        complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(C3 q) const override
+        formfactor(FormFactorSphereLogNormalRadius self, C3 q) -> complex_t
+        complex_t FormFactorSphereLogNormalRadius::formfactor(C3 q) const override
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
-        return _libBornAgainSample.FormFactorSphereLogNormalRadius_evaluate_for_q(self, q)
+        return _libBornAgainSample.FormFactorSphereLogNormalRadius_formfactor(self, q)
     __swig_destroy__ = _libBornAgainSample.delete_FormFactorSphereLogNormalRadius
 
 # Register FormFactorSphereLogNormalRadius in _libBornAgainSample:
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index e082b053366e12aa18989a42bd14c6d330cbf394..2d337559e36e743b458375de5750db9878c01aca 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -8870,7 +8870,7 @@ IFormFactor *SwigDirector_IBornFF::sliceFormFactor(ZLimits limits, IRotation con
 }
 
 
-complex_t SwigDirector_IBornFF::evaluate_for_q(C3 q) const {
+complex_t SwigDirector_IBornFF::formfactor(C3 q) const {
   complex_t c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new C3((const C3 &)q)), SWIGTYPE_p_Vec3T_std__complexT_double_t_t, SWIG_POINTER_OWN |  0 );
@@ -8879,17 +8879,17 @@ complex_t SwigDirector_IBornFF::evaluate_for_q(C3 q) const {
   }
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
   const size_t swig_method_index = 15;
-  const char *const swig_method_name = "evaluate_for_q";
+  const char *const swig_method_name = "formfactor";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
   swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate_for_q");
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("formfactor");
   swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
     if (error) {
-      Swig::DirectorMethodException::raise("Error detected when calling 'IBornFF.evaluate_for_q'");
+      Swig::DirectorMethodException::raise("Error detected when calling 'IBornFF.formfactor'");
     }
   }
   std::complex<double> swig_val;
@@ -41006,7 +41006,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IBornFF_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IBornFF_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IBornFF *arg1 = (IBornFF *) 0 ;
   C3 arg2 ;
@@ -41019,19 +41019,19 @@ SWIGINTERN PyObject *_wrap_IBornFF_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self)
   bool upcall = false;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "IBornFF_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IBornFF_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IBornFF, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IBornFF_evaluate_for_q" "', argument " "1"" of type '" "IBornFF const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IBornFF_formfactor" "', argument " "1"" of type '" "IBornFF const *""'"); 
   }
   arg1 = reinterpret_cast< IBornFF * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IBornFF_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IBornFF_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IBornFF_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IBornFF_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
@@ -41042,9 +41042,9 @@ SWIGINTERN PyObject *_wrap_IBornFF_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self)
   upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
-      Swig::DirectorPureVirtualException::raise("IBornFF::evaluate_for_q");
+      Swig::DirectorPureVirtualException::raise("IBornFF::formfactor");
     } else {
-      result = ((IBornFF const *)arg1)->evaluate_for_q(arg2);
+      result = ((IBornFF const *)arg1)->formfactor(arg2);
     }
   } catch (Swig::DirectorException&) {
     SWIG_fail;
@@ -58961,7 +58961,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IFormFactorPolyhedron_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFormFactorPolyhedron_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFormFactorPolyhedron *arg1 = (IFormFactorPolyhedron *) 0 ;
   C3 arg2 ;
@@ -58972,26 +58972,26 @@ SWIGINTERN PyObject *_wrap_IFormFactorPolyhedron_evaluate_for_q(PyObject *SWIGUN
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "IFormFactorPolyhedron_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorPolyhedron_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorPolyhedron_evaluate_for_q" "', argument " "1"" of type '" "IFormFactorPolyhedron const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorPolyhedron_formfactor" "', argument " "1"" of type '" "IFormFactorPolyhedron const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorPolyhedron * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorPolyhedron_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorPolyhedron_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorPolyhedron_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorPolyhedron_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((IFormFactorPolyhedron const *)arg1)->evaluate_for_q(arg2);
+  result = ((IFormFactorPolyhedron const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -59162,7 +59162,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IFormFactorPrism_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFormFactorPrism_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFormFactorPrism *arg1 = (IFormFactorPrism *) 0 ;
   C3 arg2 ;
@@ -59173,26 +59173,26 @@ SWIGINTERN PyObject *_wrap_IFormFactorPrism_evaluate_for_q(PyObject *SWIGUNUSEDP
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "IFormFactorPrism_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorPrism_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorPrism, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorPrism_evaluate_for_q" "', argument " "1"" of type '" "IFormFactorPrism const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorPrism_formfactor" "', argument " "1"" of type '" "IFormFactorPrism const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorPrism * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorPrism_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorPrism_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorPrism_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorPrism_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((IFormFactorPrism const *)arg1)->evaluate_for_q(arg2);
+  result = ((IFormFactorPrism const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -59368,7 +59368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IProfileRipple_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IProfileRipple *arg1 = (IProfileRipple *) 0 ;
   C3 arg2 ;
@@ -59379,26 +59379,26 @@ SWIGINTERN PyObject *_wrap_IProfileRipple_evaluate_for_q(PyObject *SWIGUNUSEDPAR
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "IProfileRipple_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IProfileRipple_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_evaluate_for_q" "', argument " "1"" of type '" "IProfileRipple const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_formfactor" "', argument " "1"" of type '" "IProfileRipple const *""'"); 
   }
   arg1 = reinterpret_cast< IProfileRipple * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IProfileRipple_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IProfileRipple_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IProfileRipple_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IProfileRipple_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((IProfileRipple const *)arg1)->evaluate_for_q(arg2);
+  result = ((IProfileRipple const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -60142,7 +60142,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorBox_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorBox_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   C3 arg2 ;
@@ -60153,26 +60153,26 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_evaluate_for_q(PyObject *SWIGUNUSEDPARM
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorBox_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorBox_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_evaluate_for_q" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_formfactor" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorBox * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorBox_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorBox_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorBox_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorBox_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorBox const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorBox const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -60736,7 +60736,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorCone_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorCone_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   C3 arg2 ;
@@ -60747,26 +60747,26 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_evaluate_for_q(PyObject *SWIGUNUSEDPAR
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorCone_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCone_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_evaluate_for_q" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_formfactor" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCone * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCone_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCone_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCone_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCone_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorCone const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorCone const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -62300,7 +62300,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorCylinder_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorCylinder_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   C3 arg2 ;
@@ -62311,26 +62311,26 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_evaluate_for_q(PyObject *SWIGUNUSE
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorCylinder_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCylinder_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_evaluate_for_q" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_formfactor" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCylinder * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCylinder_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCylinder_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCylinder_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCylinder_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorCylinder const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorCylinder const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -62857,7 +62857,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   C3 arg2 ;
@@ -62868,26 +62868,26 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_evaluate_for_q(PyObject
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorEllipsoidalCylinder_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorEllipsoidalCylinder_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_evaluate_for_q" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_formfactor" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorEllipsoidalCylinder * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorEllipsoidalCylinder_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorEllipsoidalCylinder_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorEllipsoidalCylinder_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorEllipsoidalCylinder_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorEllipsoidalCylinder const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorEllipsoidalCylinder const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -63287,7 +63287,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorFullSphere_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorFullSphere_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorFullSphere *arg1 = (FormFactorFullSphere *) 0 ;
   C3 arg2 ;
@@ -63298,26 +63298,26 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_evaluate_for_q(PyObject *SWIGUNU
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_formfactor" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSphere * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorFullSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorFullSphere_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorFullSphere const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorFullSphere const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -63596,7 +63596,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   C3 arg2 ;
@@ -63607,26 +63607,26 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_evaluate_for_q(PyObject *SWIGU
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSpheroid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSpheroid_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_formfactor" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSpheroid * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSpheroid_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSpheroid_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorFullSpheroid_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorFullSpheroid_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorFullSpheroid const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorFullSpheroid const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -63964,7 +63964,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   C3 arg2 ;
@@ -63975,26 +63975,26 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_evaluate_for_q(PyObject *SWIG
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorHemiEllipsoid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorHemiEllipsoid_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_formfactor" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorHemiEllipsoid * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHemiEllipsoid_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHemiEllipsoid_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorHemiEllipsoid_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorHemiEllipsoid_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorHemiEllipsoid const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorHemiEllipsoid const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -64205,7 +64205,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorHollowSphere_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorHollowSphere_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorHollowSphere *arg1 = (FormFactorHollowSphere *) 0 ;
   C3 arg2 ;
@@ -64216,26 +64216,26 @@ SWIGINTERN PyObject *_wrap_FormFactorHollowSphere_evaluate_for_q(PyObject *SWIGU
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorHollowSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorHollowSphere_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHollowSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHollowSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorHollowSphere const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHollowSphere_formfactor" "', argument " "1"" of type '" "FormFactorHollowSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorHollowSphere * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHollowSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHollowSphere_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorHollowSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorHollowSphere_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorHollowSphere const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorHollowSphere const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -64762,7 +64762,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   C3 arg2 ;
@@ -64773,26 +64773,26 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_evaluate_for_q(PyObject *SWIGU
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxGauss_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxGauss_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_formfactor" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxGauss * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxGauss_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxGauss_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorLongBoxGauss_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorLongBoxGauss_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorLongBoxGauss const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorLongBoxGauss const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -65108,7 +65108,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   C3 arg2 ;
@@ -65119,26 +65119,26 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_evaluate_for_q(PyObject *SWI
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxLorentz_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxLorentz_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_formfactor" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxLorentz * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxLorentz_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxLorentz_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorLongBoxLorentz_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorLongBoxLorentz_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorLongBoxLorentz const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorLongBoxLorentz const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -67412,7 +67412,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   C3 arg2 ;
@@ -67423,26 +67423,26 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_evaluate_for_q(PyObject *SW
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSphere_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_formfactor" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSphere_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorTruncatedSphere_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorTruncatedSphere const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorTruncatedSphere const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -67795,7 +67795,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   C3 arg2 ;
@@ -67806,26 +67806,26 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_evaluate_for_q(PyObject *
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSpheroid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSpheroid_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_formfactor" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSpheroid * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSpheroid_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSpheroid_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorTruncatedSpheroid_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorTruncatedSpheroid_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorTruncatedSpheroid const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorTruncatedSpheroid const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -68067,7 +68067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorGaussSphere_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorGaussSphere_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorGaussSphere *arg1 = (FormFactorGaussSphere *) 0 ;
   C3 arg2 ;
@@ -68078,26 +68078,26 @@ SWIGINTERN PyObject *_wrap_FormFactorGaussSphere_evaluate_for_q(PyObject *SWIGUN
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorGaussSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorGaussSphere_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGaussSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGaussSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorGaussSphere const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGaussSphere_formfactor" "', argument " "1"" of type '" "FormFactorGaussSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorGaussSphere * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorGaussSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorGaussSphere_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorGaussSphere_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorGaussSphere_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorGaussSphere const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorGaussSphere const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -68330,7 +68330,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
   C3 arg2 ;
@@ -68341,26 +68341,26 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_evaluate_for_q(PyObjec
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereGaussianRadius_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereGaussianRadius_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_evaluate_for_q" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_formfactor" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereGaussianRadius * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereGaussianRadius_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereGaussianRadius_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorSphereGaussianRadius_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorSphereGaussianRadius_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorSphereGaussianRadius const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorSphereGaussianRadius const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -68653,7 +68653,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_formfactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
   C3 arg2 ;
@@ -68664,26 +68664,26 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_evaluate_for_q(PyObje
   PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereLogNormalRadius_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereLogNormalRadius_formfactor", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_evaluate_for_q" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_formfactor" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereLogNormalRadius * >(argp1);
   {
     res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereLogNormalRadius_evaluate_for_q" "', argument " "2"" of type '" "C3""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereLogNormalRadius_formfactor" "', argument " "2"" of type '" "C3""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorSphereLogNormalRadius_evaluate_for_q" "', argument " "2"" of type '" "C3""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorSphereLogNormalRadius_formfactor" "', argument " "2"" of type '" "C3""'");
     } else {
       C3 * temp = reinterpret_cast< C3 * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  result = ((FormFactorSphereLogNormalRadius const *)arg1)->evaluate_for_q(arg2);
+  result = ((FormFactorSphereLogNormalRadius const *)arg1)->formfactor(arg2);
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -71975,9 +71975,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { "IBornFF_evaluate_for_q", _wrap_IBornFF_evaluate_for_q, METH_VARARGS, "\n"
-		"IBornFF_evaluate_for_q(IBornFF self, C3 q) -> complex_t\n"
-		"virtual complex_t IBornFF::evaluate_for_q(C3 q) const =0\n"
+	 { "IBornFF_formfactor", _wrap_IBornFF_formfactor, METH_VARARGS, "\n"
+		"IBornFF_formfactor(IBornFF self, C3 q) -> complex_t\n"
+		"virtual complex_t IBornFF::formfactor(C3 q) const =0\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75097,9 +75097,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { "IFormFactorPolyhedron_evaluate_for_q", _wrap_IFormFactorPolyhedron_evaluate_for_q, METH_VARARGS, "\n"
-		"IFormFactorPolyhedron_evaluate_for_q(IFormFactorPolyhedron self, C3 q) -> complex_t\n"
-		"complex_t IFormFactorPolyhedron::evaluate_for_q(C3 q) const override\n"
+	 { "IFormFactorPolyhedron_formfactor", _wrap_IFormFactorPolyhedron_formfactor, METH_VARARGS, "\n"
+		"IFormFactorPolyhedron_formfactor(IFormFactorPolyhedron self, C3 q) -> complex_t\n"
+		"complex_t IFormFactorPolyhedron::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75145,9 +75145,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { "IFormFactorPrism_evaluate_for_q", _wrap_IFormFactorPrism_evaluate_for_q, METH_VARARGS, "\n"
-		"IFormFactorPrism_evaluate_for_q(IFormFactorPrism self, C3 q) -> complex_t\n"
-		"complex_t IFormFactorPrism::evaluate_for_q(C3 q) const override\n"
+	 { "IFormFactorPrism_formfactor", _wrap_IFormFactorPrism_formfactor, METH_VARARGS, "\n"
+		"IFormFactorPrism_formfactor(IFormFactorPrism self, C3 q) -> complex_t\n"
+		"complex_t IFormFactorPrism::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns the form factor F(q) of this polyhedron, respecting the offset height/2. \n"
 		"\n"
@@ -75194,9 +75194,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "IProfileRipple_evaluate_for_q", _wrap_IProfileRipple_evaluate_for_q, METH_VARARGS, "\n"
-		"IProfileRipple_evaluate_for_q(IProfileRipple self, C3 q) -> complex_t\n"
-		"complex_t IProfileRipple::evaluate_for_q(C3 q) const override\n"
+	 { "IProfileRipple_formfactor", _wrap_IProfileRipple_formfactor, METH_VARARGS, "\n"
+		"IProfileRipple_formfactor(IProfileRipple self, C3 q) -> complex_t\n"
+		"complex_t IProfileRipple::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75307,9 +75307,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorBox_evaluate_for_q", _wrap_FormFactorBox_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorBox_evaluate_for_q(FormFactorBox self, C3 q) -> complex_t\n"
-		"complex_t FormFactorBox::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorBox_formfactor", _wrap_FormFactorBox_formfactor, METH_VARARGS, "\n"
+		"FormFactorBox_formfactor(FormFactorBox self, C3 q) -> complex_t\n"
+		"complex_t FormFactorBox::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75398,9 +75398,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorCone_evaluate_for_q", _wrap_FormFactorCone_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorCone_evaluate_for_q(FormFactorCone self, C3 q) -> complex_t\n"
-		"complex_t FormFactorCone::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorCone_formfactor", _wrap_FormFactorCone_formfactor, METH_VARARGS, "\n"
+		"FormFactorCone_formfactor(FormFactorCone self, C3 q) -> complex_t\n"
+		"complex_t FormFactorCone::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75613,9 +75613,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorCylinder_evaluate_for_q", _wrap_FormFactorCylinder_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorCylinder_evaluate_for_q(FormFactorCylinder self, C3 q) -> complex_t\n"
-		"complex_t FormFactorCylinder::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorCylinder_formfactor", _wrap_FormFactorCylinder_formfactor, METH_VARARGS, "\n"
+		"FormFactorCylinder_formfactor(FormFactorCylinder self, C3 q) -> complex_t\n"
+		"complex_t FormFactorCylinder::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75699,9 +75699,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorEllipsoidalCylinder_evaluate_for_q", _wrap_FormFactorEllipsoidalCylinder_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorEllipsoidalCylinder_evaluate_for_q(FormFactorEllipsoidalCylinder self, C3 q) -> complex_t\n"
-		"complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorEllipsoidalCylinder_formfactor", _wrap_FormFactorEllipsoidalCylinder_formfactor, METH_VARARGS, "\n"
+		"FormFactorEllipsoidalCylinder_formfactor(FormFactorEllipsoidalCylinder self, C3 q) -> complex_t\n"
+		"complex_t FormFactorEllipsoidalCylinder::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75758,9 +75758,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { "FormFactorFullSphere_evaluate_for_q", _wrap_FormFactorFullSphere_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorFullSphere_evaluate_for_q(FormFactorFullSphere self, C3 q) -> complex_t\n"
-		"complex_t FormFactorFullSphere::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorFullSphere_formfactor", _wrap_FormFactorFullSphere_formfactor, METH_VARARGS, "\n"
+		"FormFactorFullSphere_formfactor(FormFactorFullSphere self, C3 q) -> complex_t\n"
+		"complex_t FormFactorFullSphere::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75808,9 +75808,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorFullSpheroid_evaluate_for_q", _wrap_FormFactorFullSpheroid_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorFullSpheroid_evaluate_for_q(FormFactorFullSpheroid self, C3 q) -> complex_t\n"
-		"complex_t FormFactorFullSpheroid::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorFullSpheroid_formfactor", _wrap_FormFactorFullSpheroid_formfactor, METH_VARARGS, "\n"
+		"FormFactorFullSpheroid_formfactor(FormFactorFullSpheroid self, C3 q) -> complex_t\n"
+		"complex_t FormFactorFullSpheroid::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75868,9 +75868,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorHemiEllipsoid_evaluate_for_q", _wrap_FormFactorHemiEllipsoid_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorHemiEllipsoid_evaluate_for_q(FormFactorHemiEllipsoid self, C3 q) -> complex_t\n"
-		"complex_t FormFactorHemiEllipsoid::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorHemiEllipsoid_formfactor", _wrap_FormFactorHemiEllipsoid_formfactor, METH_VARARGS, "\n"
+		"FormFactorHemiEllipsoid_formfactor(FormFactorHemiEllipsoid self, C3 q) -> complex_t\n"
+		"complex_t FormFactorHemiEllipsoid::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75907,9 +75907,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorHollowSphere_evaluate_for_q", _wrap_FormFactorHollowSphere_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorHollowSphere_evaluate_for_q(FormFactorHollowSphere self, C3 q) -> complex_t\n"
-		"complex_t FormFactorHollowSphere::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorHollowSphere_formfactor", _wrap_FormFactorHollowSphere_formfactor, METH_VARARGS, "\n"
+		"FormFactorHollowSphere_formfactor(FormFactorHollowSphere self, C3 q) -> complex_t\n"
+		"complex_t FormFactorHollowSphere::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -75993,9 +75993,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorLongBoxGauss_evaluate_for_q", _wrap_FormFactorLongBoxGauss_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorLongBoxGauss_evaluate_for_q(FormFactorLongBoxGauss self, C3 q) -> complex_t\n"
-		"complex_t FormFactorLongBoxGauss::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorLongBoxGauss_formfactor", _wrap_FormFactorLongBoxGauss_formfactor, METH_VARARGS, "\n"
+		"FormFactorLongBoxGauss_formfactor(FormFactorLongBoxGauss self, C3 q) -> complex_t\n"
+		"complex_t FormFactorLongBoxGauss::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -76048,9 +76048,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorLongBoxLorentz_evaluate_for_q", _wrap_FormFactorLongBoxLorentz_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorLongBoxLorentz_evaluate_for_q(FormFactorLongBoxLorentz self, C3 q) -> complex_t\n"
-		"complex_t FormFactorLongBoxLorentz::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorLongBoxLorentz_formfactor", _wrap_FormFactorLongBoxLorentz_formfactor, METH_VARARGS, "\n"
+		"FormFactorLongBoxLorentz_formfactor(FormFactorLongBoxLorentz self, C3 q) -> complex_t\n"
+		"complex_t FormFactorLongBoxLorentz::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -76361,9 +76361,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorTruncatedSphere_evaluate_for_q", _wrap_FormFactorTruncatedSphere_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorTruncatedSphere_evaluate_for_q(FormFactorTruncatedSphere self, C3 q) -> complex_t\n"
-		"complex_t FormFactorTruncatedSphere::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorTruncatedSphere_formfactor", _wrap_FormFactorTruncatedSphere_formfactor, METH_VARARGS, "\n"
+		"FormFactorTruncatedSphere_formfactor(FormFactorTruncatedSphere self, C3 q) -> complex_t\n"
+		"complex_t FormFactorTruncatedSphere::formfactor(C3 q) const override\n"
 		"\n"
 		"Complex form factor. \n"
 		"\n"
@@ -76421,9 +76421,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorTruncatedSpheroid_evaluate_for_q", _wrap_FormFactorTruncatedSpheroid_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorTruncatedSpheroid_evaluate_for_q(FormFactorTruncatedSpheroid self, C3 q) -> complex_t\n"
-		"complex_t FormFactorTruncatedSpheroid::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorTruncatedSpheroid_formfactor", _wrap_FormFactorTruncatedSpheroid_formfactor, METH_VARARGS, "\n"
+		"FormFactorTruncatedSpheroid_formfactor(FormFactorTruncatedSpheroid self, C3 q) -> complex_t\n"
+		"complex_t FormFactorTruncatedSpheroid::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -76466,9 +76466,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorGaussSphere_evaluate_for_q", _wrap_FormFactorGaussSphere_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorGaussSphere_evaluate_for_q(FormFactorGaussSphere self, C3 q) -> complex_t\n"
-		"complex_t FormFactorGaussSphere::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorGaussSphere_formfactor", _wrap_FormFactorGaussSphere_formfactor, METH_VARARGS, "\n"
+		"FormFactorGaussSphere_formfactor(FormFactorGaussSphere self, C3 q) -> complex_t\n"
+		"complex_t FormFactorGaussSphere::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -76506,9 +76506,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorSphereGaussianRadius_evaluate_for_q", _wrap_FormFactorSphereGaussianRadius_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorSphereGaussianRadius_evaluate_for_q(FormFactorSphereGaussianRadius self, C3 q) -> complex_t\n"
-		"complex_t FormFactorSphereGaussianRadius::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorSphereGaussianRadius_formfactor", _wrap_FormFactorSphereGaussianRadius_formfactor, METH_VARARGS, "\n"
+		"FormFactorSphereGaussianRadius_formfactor(FormFactorSphereGaussianRadius self, C3 q) -> complex_t\n"
+		"complex_t FormFactorSphereGaussianRadius::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
@@ -76546,9 +76546,9 @@ static PyMethodDef SwigMethods[] = {
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { "FormFactorSphereLogNormalRadius_evaluate_for_q", _wrap_FormFactorSphereLogNormalRadius_evaluate_for_q, METH_VARARGS, "\n"
-		"FormFactorSphereLogNormalRadius_evaluate_for_q(FormFactorSphereLogNormalRadius self, C3 q) -> complex_t\n"
-		"complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(C3 q) const override\n"
+	 { "FormFactorSphereLogNormalRadius_formfactor", _wrap_FormFactorSphereLogNormalRadius_formfactor, METH_VARARGS, "\n"
+		"FormFactorSphereLogNormalRadius_formfactor(FormFactorSphereLogNormalRadius self, C3 q) -> complex_t\n"
+		"complex_t FormFactorSphereLogNormalRadius::formfactor(C3 q) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
diff --git a/auto/Wrap/libBornAgainSample_wrap.h b/auto/Wrap/libBornAgainSample_wrap.h
index 8d9db4b3695b4614d91378d5b202cb77d787bdda..7855c2236665ef1ccbc5c4031553b3a39ff880f2 100644
--- a/auto/Wrap/libBornAgainSample_wrap.h
+++ b/auto/Wrap/libBornAgainSample_wrap.h
@@ -154,7 +154,7 @@ public:
     virtual IFormFactor *sliceFormFactorSwigPublic(ZLimits limits, IRotation const &rot, R3 translation) const {
       return IFormFactor::sliceFormFactor(limits,rot,translation);
     }
-    virtual complex_t evaluate_for_q(C3 q) const;
+    virtual complex_t formfactor(C3 q) const;
 
 /* Internal director utilities */
 public: