Index: kernel/include/IMP/internal/constants.h
===================================================================
--- kernel/include/IMP/internal/constants.h	(revision 611)
+++ kernel/include/IMP/internal/constants.h	(working copy)
@@ -28,7 +28,7 @@
 unit::Shift<unit::Divide<unit::Joule, unit::Kelvin>::type, -23>::type KB;
 
 //! the default temperature
-extern IMPDLLEXPORT const unit::Kelvin T;
+extern IMPDLLEXPORT const unit::Kelvin DEFAULT_TEMPERATURE;
 
 //! Pi
 static const double PI = 3.1415926535897931;
Index: kernel/include/IMP/unary_functions/WormLikeChain.h
===================================================================
--- kernel/include/IMP/unary_functions/WormLikeChain.h	(revision 611)
+++ kernel/include/IMP/unary_functions/WormLikeChain.h	(working copy)
@@ -32,7 +32,7 @@
       \param[in] lp persistence length in angstroms
    */
   WormLikeChain(Float l_max, Float lp) : lmax_(l_max), lp_(lp) {
-    IMP_check(l_max > lp, "The persistence length should be less "
+    IMP_check(l_max > lp, "The persistance length should be less "
               << "than the total length for this model",
               ValueException);
   }
@@ -93,7 +93,7 @@
 protected:
   //! \note named to avoid clash with 'deriv' argument
   unit::Piconewton cderiv(unit::Angstrom l) const {
-    unit::Piconewton pn= internal::KB*internal::T
+    unit::Piconewton pn= internal::KB*internal::DEFAULT_TEMPERATURE
       /lp_*(.25/ square(1.0-(l/lmax_).get_normalized_value())
             -.25+(l/lmax_).to_scalar());
      return pn;
@@ -101,7 +101,7 @@
 
   unit::Picojoule eval(unit::Angstrom m) const {
     unit::Picojoule J
-      =  internal::KB*internal::T/lp_*(.25*square(lmax_)
+      =  internal::KB*internal::DEFAULT_TEMPERATURE/lp_*(.25*square(lmax_)
                                        /(lmax_-m)
                                        -m*.25
                                        +.5*square(m)
Index: kernel/src/optimizers/BrownianDynamics.cpp
===================================================================
--- kernel/src/optimizers/BrownianDynamics.cpp	(revision 611)
+++ kernel/src/optimizers/BrownianDynamics.cpp	(working copy)
@@ -66,7 +66,7 @@
 
 BrownianDynamics::BrownianDynamics(FloatKey dkey) :
   max_change_(10), max_dt_(1e7), cur_dt_(max_dt_), cur_time_(0),
-  T_(300.0), dkey_(dkey)
+  T_(internal::DEFAULT_TEMPERATURE), dkey_(dkey)
 {
   IMP_check(dkey_ != FloatKey(), "BrownianDynamics needs a valid key for the "
             << "diffusion coefficient",
Index: kernel/src/internal/constants.cpp
===================================================================
--- kernel/src/internal/constants.cpp	(revision 611)
+++ kernel/src/internal/constants.cpp	(working copy)
@@ -14,14 +14,11 @@
 {
 
 const unit::ExponentialNumber<23> NA(6.02214179);
-
-const unit::internal::AtomsPerMol unit::ATOMS_PER_MOL = {};
-
 // definition of KB
 const unit::Shift<unit::Divide<unit::Joule, unit::Kelvin>::type, -23>::type
 KB(1.3806503);
 
-const unit::Kelvin T(297.15);
+const unit::Kelvin DEFAULT_TEMPERATURE(297.15);
 
 
 const unit::ExponentialNumber<3> JOULES_PER_KILOCALORIE(4.1868);