diff --git a/src/tsqsim-lib/src/TSXformFactory.cpp b/src/tsqsim-lib/src/TSXformFactory.cpp
index 80d7a5d..b6df0b2 100644
--- a/src/tsqsim-lib/src/TSXformFactory.cpp
+++ b/src/tsqsim-lib/src/TSXformFactory.cpp
@@ -40,8 +40,8 @@ CorPtr<ITSXform> TSXformFactory::Create(const Str & name) const
         {
             case TSXformType::DIFF:     return CorPtr<ITSXform>(new TSXformDiff());
             case TSXformType::FABS:     return CorPtr<ITSXform>(new TSXformFabs());
-            case TSXformType::SQRTS:    return CorPtr<ITSXform>(new TSXformSqrtSafe());
-            case TSXformType::LOGS:     return CorPtr<ITSXform>(new TSXformLogSafe());
+            case TSXformType::SQRTS:    return CorPtr<ITSXform>(new TSXformSqrt());
+            case TSXformType::LOGS:     return CorPtr<ITSXform>(new TSXformLog());
             case TSXformType::ADD:      return CorPtr<ITSXform>(new TSXformAdd(params));
             case TSXformType::MUL:      return CorPtr<ITSXform>(new TSXformMul(params));
             case TSXformType::DIV:      return CorPtr<ITSXform>(new TSXformDiv(params));
diff --git a/src/tsqsim-lib/src/TSXformImpl.cpp b/src/tsqsim-lib/src/TSXformImpl.cpp
index 740bc6a..a619453 100644
--- a/src/tsqsim-lib/src/TSXformImpl.cpp
+++ b/src/tsqsim-lib/src/TSXformImpl.cpp
@@ -46,11 +46,11 @@ double TSXformFabs::Invert(const EnjoLib::VecD & vals) const
     return vals.at(0);
 }
 
-double TSXformSqrtSafe::Run(const TSFunBase & input, int idx, double valPrev) const
+double TSXformSqrt::Run(const TSFunBase & input, int idx, double valPrev) const
 {
     return Run(VecD(1, valPrev));
 }
-double TSXformSqrtSafe::Run(const EnjoLib::VecD & vals) const
+double TSXformSqrt::Run(const EnjoLib::VecD & vals) const
 {
     const double valPrev = vals.at(0);
     const GMat gmat;
@@ -67,7 +67,7 @@ double TSXformSqrtSafe::Run(const EnjoLib::VecD & vals) const
         return -gmat.Sqrt(-valPrev);
     }
 }
-double TSXformSqrtSafe::Invert(const EnjoLib::VecD & vals) const
+double TSXformSqrt::Invert(const EnjoLib::VecD & vals) const
 {
     const double valPrev = vals.at(0);
     const GMat gmat;
@@ -75,11 +75,11 @@ double TSXformSqrtSafe::Invert(const EnjoLib::VecD & vals) const
     return valPrev < 0 ? -pow : pow;
 }
 
-double TSXformLogSafe::Run(const TSFunBase & input, int idx, double valPrev) const
+double TSXformLog::Run(const TSFunBase & input, int idx, double valPrev) const
 {
     return Run(VecD(1, valPrev));
 }
-double TSXformLogSafe::Run(const EnjoLib::VecD & vals) const
+double TSXformLog::Run(const EnjoLib::VecD & vals) const
 {
     const double valPrev = vals.at(0);
     const GMat gmat;
@@ -97,7 +97,7 @@ double TSXformLogSafe::Run(const EnjoLib::VecD & vals) const
         return -gmat.Log(diff + VAL_BORDER); /// TODO: Call Log only once (after UTs)
     }
 }
-double TSXformLogSafe::Invert(const EnjoLib::VecD & vals) const
+double TSXformLog::Invert(const EnjoLib::VecD & vals) const
 {
     const double val = vals.at(0);
     const GMat gmat;
diff --git a/src/tsqsim-lib/src/TSXformImpl.h b/src/tsqsim-lib/src/TSXformImpl.h
index 306a739..6e184a7 100644
--- a/src/tsqsim-lib/src/TSXformImpl.h
+++ b/src/tsqsim-lib/src/TSXformImpl.h
@@ -19,14 +19,14 @@ struct TSXformFabs : public ITSXform
         double Invert(const EnjoLib::VecD & vals) const override;
 };
 
-struct TSXformSqrtSafe : public ITSXform
+struct TSXformSqrt : public ITSXform
 {
         double Run(const TSFunBase & input, int idx, double valPrev) const override;
         double Run(const EnjoLib::VecD & vals) const override;
         double Invert(const EnjoLib::VecD & vals) const override;
 };
 
-struct TSXformLogSafe : public ITSXform
+struct TSXformLog : public ITSXform
 {
         double Run(const TSFunBase & input, int idx, double valPrev) const override;
         double Run(const EnjoLib::VecD & vals) const override;
diff --git a/src/tsqsim-lib/src/TSXformTypeString.cpp b/src/tsqsim-lib/src/TSXformTypeString.cpp
index 7d1db65..3bead22 100644
--- a/src/tsqsim-lib/src/TSXformTypeString.cpp
+++ b/src/tsqsim-lib/src/TSXformTypeString.cpp
@@ -12,8 +12,8 @@ TSXformTypeString:: TSXformTypeString()
         {
             case TSXformType::DIFF:     Add(i, "diff"); break;
             case TSXformType::FABS:     Add(i, "fabs"); break;
-            case TSXformType::SQRTS:    Add(i, "sqrts"); break;
-            case TSXformType::LOGS:     Add(i, "logs"); break;
+            case TSXformType::SQRTS:    Add(i, "sqrt"); break;
+            case TSXformType::LOGS:     Add(i, "log"); break;
             case TSXformType::ADD:      Add(i, "add"); break;
             case TSXformType::MUL:      Add(i, "mul"); break;
             case TSXformType::DIV:      Add(i, "div"); break;
diff --git a/src/tsqsim/scripts/ts-xform-script.txt b/src/tsqsim/scripts/ts-xform-script.txt
index 6067a5d..5638f8b 100644
--- a/src/tsqsim/scripts/ts-xform-script.txt
+++ b/src/tsqsim/scripts/ts-xform-script.txt
@@ -1,9 +1,9 @@
 diff
 #fabs
 #sqrt
-logs
-#sqrts
-#logs
+log
+#sqrt
+#log
 add 0
 
 
diff --git a/tests/test-tsqsim/src/TSXformImplTest.cpp b/tests/test-tsqsim/src/TSXformImplTest.cpp
index af8ed08..caef82d 100644
--- a/tests/test-tsqsim/src/TSXformImplTest.cpp
+++ b/tests/test-tsqsim/src/TSXformImplTest.cpp
@@ -84,4 +84,4 @@ TEST(Conv_diffs)
 TEST(Conv_fabs)
 {
     /// TODO: TSXformType::FABS:
-}
\ No newline at end of file
+}