diff --git a/Core/Basics/ISingleton.h b/Core/Basics/ISingleton.h
index 7a7647cea815cb110a97ba9dd096f8d960b3c918..d9c2bb3e7c34fdd88aadeb7769dc75a234796bdb 100644
--- a/Core/Basics/ISingleton.h
+++ b/Core/Basics/ISingleton.h
@@ -34,7 +34,7 @@ public:
         std::unique_lock<std::mutex> single_lock( single_mutex );
         if( !m_instance) {
             if( m_destroyed )
-                throw std::runtime_error("BUG in ISingleton: object was destructed!");
+                throw std::runtime_error("Bug in ISingleton: object was destructed!");
             static T theInstance;
             m_instance = &theInstance;
         }
diff --git a/Core/HardParticle/FormFactorPolyhedron.cpp b/Core/HardParticle/FormFactorPolyhedron.cpp
index 92be9d79bd1b38b446508e4fb1ae24e962e194b8..ae79783d24960cc42339cc425e0a13fad6908aeb 100644
--- a/Core/HardParticle/FormFactorPolyhedron.cpp
+++ b/Core/HardParticle/FormFactorPolyhedron.cpp
@@ -566,7 +566,7 @@ void FormFactorPolyhedron::assert_platonic() const
     pyramidal_volume /= m_faces.size();
     for( const auto& Gk: m_faces )
         if (std::abs(Gk.pyramidalVolume()-pyramidal_volume) > 160*eps*pyramidal_volume) {
-            std::cerr<<std::setprecision(16)<<"BUG: pyr_volume(this face)="<<
+            std::cerr<<std::setprecision(16)<<"Bug: pyr_volume(this face)="<<
                 Gk.pyramidalVolume()<<" vs pyr_volume(avge)="<<pyramidal_volume<<"\n";
             throw std::runtime_error("Deviant pyramidal volume in "+getName());
         }
diff --git a/Core/Parametrization/ParameterPool.cpp b/Core/Parametrization/ParameterPool.cpp
index 2d788742c4fb603f2aa4b660cbc2d79bfd007559..8378295dc2fc84463530d743e2cf15d5dbc06f67 100644
--- a/Core/Parametrization/ParameterPool.cpp
+++ b/Core/Parametrization/ParameterPool.cpp
@@ -67,7 +67,7 @@ void ParameterPool::addParameter(RealParameter* newPar)
     for (const auto* par: m_params )
         if( par->getName()==newPar->getName() )
             throw std::runtime_error(
-                "BUG in ParameterPool::addParameter(): "
+                "Bug in ParameterPool::addParameter(): "
                 "Parameter '"+newPar->getName()+"' is already registered");
     m_params.push_back(newPar);
 }
@@ -210,8 +210,7 @@ void ParameterPool::report_set_value_error(const std::string& parname, double va
     try {
         ostr << " Parameter limits " << getParameter(parname)->getAttLimits() << ".\n";
     } catch (...) {
-        throw std::runtime_error(
-            "DOUBLE BUG in ParameterPool: cannot even report the error");
+        throw std::runtime_error("Bug de luxe in ParameterPool: cannot even report the error");
     }
     throw std::runtime_error(ostr.str());
 }
diff --git a/Core/Parametrization/RealParameter.cpp b/Core/Parametrization/RealParameter.cpp
index fd4779c7639f1128f593898ff0c5b9233f1c2c26..5e695662e284450faeec723603fecac3fe3c31d5 100644
--- a/Core/Parametrization/RealParameter.cpp
+++ b/Core/Parametrization/RealParameter.cpp
@@ -45,7 +45,7 @@ void RealParameter::checkNull() const
 {
     if(isNull())
         throw std::runtime_error(
-            "BUG in RealParameter::getValue() -> Attempt to access uninitialised pointer.");
+            "Bug in RealParameter::getValue() -> Attempt to access uninitialised pointer.");
 }
 
 void RealParameter::setValue(double value)
diff --git a/Core/Particle/FormFactorCrystal.cpp b/Core/Particle/FormFactorCrystal.cpp
index ac2dee7525ebc91819c11d65d650a1f070746082..83f674825efc1bc16bef968d3b29b368cc7a8996 100644
--- a/Core/Particle/FormFactorCrystal.cpp
+++ b/Core/Particle/FormFactorCrystal.cpp
@@ -53,7 +53,7 @@ double FormFactorCrystal::getRadialExtension() const
 complex_t FormFactorCrystal::evaluate_for_q(const cvector_t) const
 {
     throw Exceptions::LogicErrorException(
-        "BUG: evaluate_for_q() should never be called explicitly for FormFactorCrystal");
+        "Bug: evaluate_for_q() should never be called explicitly for FormFactorCrystal");
 }
 
 complex_t FormFactorCrystal::evaluate(const WavevectorInfo& wavevectors) const