diff --git a/uppsrc/Core/POP3/src.tpp/InetMessage$en-us.tpp b/uppsrc/Core/POP3/src.tpp/InetMessage_en-us.tpp
similarity index 100%
rename from uppsrc/Core/POP3/src.tpp/InetMessage$en-us.tpp
rename to uppsrc/Core/POP3/src.tpp/InetMessage_en-us.tpp
diff --git a/uppsrc/Core/POP3/src.tpp/Pop3$en-us.tpp b/uppsrc/Core/POP3/src.tpp/Pop3_en-us.tpp
similarity index 100%
rename from uppsrc/Core/POP3/src.tpp/Pop3$en-us.tpp
rename to uppsrc/Core/POP3/src.tpp/Pop3_en-us.tpp
diff --git a/uppsrc/Core/SMTP/src.tpp/SMTP$en-us.tpp b/uppsrc/Core/SMTP/src.tpp/SMTP_en-us.tpp
similarity index 100%
rename from uppsrc/Core/SMTP/src.tpp/SMTP$en-us.tpp
rename to uppsrc/Core/SMTP/src.tpp/SMTP_en-us.tpp
diff --git a/uppsrc/Docking/src.tpp/DockWindow$en-us.tpp b/uppsrc/Docking/src.tpp/DockWindow_en-us.tpp
similarity index 100%
rename from uppsrc/Docking/src.tpp/DockWindow$en-us.tpp
rename to uppsrc/Docking/src.tpp/DockWindow_en-us.tpp
diff --git a/uppsrc/Docking/src.tpp/DockableCtrl$en-us.tpp b/uppsrc/Docking/src.tpp/DockableCtrl_en-us.tpp
similarity index 100%
rename from uppsrc/Docking/src.tpp/DockableCtrl$en-us.tpp
rename to uppsrc/Docking/src.tpp/DockableCtrl_en-us.tpp
diff --git a/uppsrc/Docking/src.tpp/Utility$en-us.tpp b/uppsrc/Docking/src.tpp/Utility_en-us.tpp
similarity index 100%
rename from uppsrc/Docking/src.tpp/Utility$en-us.tpp
rename to uppsrc/Docking/src.tpp/Utility_en-us.tpp
diff --git a/uppsrc/Docking/src.tpp/all.i b/uppsrc/Docking/src.tpp/all.i
index 1b63c8052..fce8244c3 100644
--- a/uppsrc/Docking/src.tpp/all.i
+++ b/uppsrc/Docking/src.tpp/all.i
@@ -1,12 +1,12 @@
-TOPIC("DockableCtrl$en-us")
-#include "DockableCtrl$en-us.tpp"
+TOPIC("DockableCtrl_en-us")
+#include "DockableCtrl_en-us.tpp"
 END_TOPIC
 
-TOPIC("DockWindow$en-us")
-#include "DockWindow$en-us.tpp"
+TOPIC("DockWindow_en-us")
+#include "DockWindow_en-us.tpp"
 END_TOPIC
 
-TOPIC("Utility$en-us")
-#include "Utility$en-us.tpp"
+TOPIC("Utility_en-us")
+#include "Utility_en-us.tpp"
 END_TOPIC
 
diff --git a/uppsrc/Esc/srcdoc.tpp/Esc$en-us.tppi b/uppsrc/Esc/srcdoc.tpp/Esc_en-us.tppi
similarity index 100%
rename from uppsrc/Esc/srcdoc.tpp/Esc$en-us.tppi
rename to uppsrc/Esc/srcdoc.tpp/Esc_en-us.tppi
diff --git a/uppsrc/Esc/srcdoc.tpp/all.i b/uppsrc/Esc/srcdoc.tpp/all.i
index 979cb9fc5..6ccb982a0 100644
--- a/uppsrc/Esc/srcdoc.tpp/all.i
+++ b/uppsrc/Esc/srcdoc.tpp/all.i
@@ -1,4 +1,4 @@
-TOPIC("Esc$en-us")
-#include "Esc$en-us.tppi"
+TOPIC("Esc_en-us")
+#include "Esc_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles$cs-cz.tpp b/uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles_cs-cz.tpp
similarity index 100%
rename from uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles$cs-cz.tpp
rename to uppsrc/Geom/Ctrl/appdoc.tpp/PathStyles_cs-cz.tpp
diff --git a/uppsrc/Geom/Ctrl/appdoc.tpp/all.i b/uppsrc/Geom/Ctrl/appdoc.tpp/all.i
index d88793809..86a061dd4 100644
--- a/uppsrc/Geom/Ctrl/appdoc.tpp/all.i
+++ b/uppsrc/Geom/Ctrl/appdoc.tpp/all.i
@@ -1,3 +1,3 @@
-TOPIC("PathStyles$cs-cz")
-#include "PathStyles$cs-cz.tpp"
+TOPIC("PathStyles_cs-cz")
+#include "PathStyles_cs-cz.tpp"
 END_TOPIC
diff --git a/uppsrc/GridCtrl/src.tpp/API$en-us.tpp b/uppsrc/GridCtrl/src.tpp/API_en-us.tpp
similarity index 100%
rename from uppsrc/GridCtrl/src.tpp/API$en-us.tpp
rename to uppsrc/GridCtrl/src.tpp/API_en-us.tpp
diff --git a/uppsrc/GridCtrl/src.tpp/Tutorial$en-us.tpp b/uppsrc/GridCtrl/src.tpp/Tutorial_en-us.tpp
similarity index 100%
rename from uppsrc/GridCtrl/src.tpp/Tutorial$en-us.tpp
rename to uppsrc/GridCtrl/src.tpp/Tutorial_en-us.tpp
diff --git a/uppsrc/HexView/app.tpp/search$en-us.tpp b/uppsrc/HexView/app.tpp/search_en-us.tpp
similarity index 100%
rename from uppsrc/HexView/app.tpp/search$en-us.tpp
rename to uppsrc/HexView/app.tpp/search_en-us.tpp
diff --git a/uppsrc/MySql/srcdoc.tpp/NativeMySql$en-us.tpp b/uppsrc/MySql/srcdoc.tpp/NativeMySql_en-us.tpp
similarity index 100%
rename from uppsrc/MySql/srcdoc.tpp/NativeMySql$en-us.tpp
rename to uppsrc/MySql/srcdoc.tpp/NativeMySql_en-us.tpp
diff --git a/uppsrc/Ole/srcdoc.tpp/all.i b/uppsrc/Ole/srcdoc.tpp/all.i
index 40b71bf53..500ab39c8 100644
--- a/uppsrc/Ole/srcdoc.tpp/all.i
+++ b/uppsrc/Ole/srcdoc.tpp/all.i
@@ -1,3 +1,3 @@
-TOPIC("ocx$en-us")
-#include "ocx$en-us.tpp"
+TOPIC("ocx_en-us")
+#include "ocx_en-us.tpp"
 END_TOPIC
diff --git a/uppsrc/Ole/srcdoc.tpp/ocx$en-us.tpp b/uppsrc/Ole/srcdoc.tpp/ocx_en-us.tpp
similarity index 100%
rename from uppsrc/Ole/srcdoc.tpp/ocx$en-us.tpp
rename to uppsrc/Ole/srcdoc.tpp/ocx_en-us.tpp
diff --git a/uppsrc/RasterPlayer/src.tpp/RasterPlayer$en-us.tpp b/uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp
similarity index 100%
rename from uppsrc/RasterPlayer/src.tpp/RasterPlayer$en-us.tpp
rename to uppsrc/RasterPlayer/src.tpp/RasterPlayer_en-us.tpp
diff --git a/uppsrc/Report/srcdoc.tpp/PrintArea$en-us.tpp b/uppsrc/Report/srcdoc.tpp/PrintArea_en-us.tpp
similarity index 100%
rename from uppsrc/Report/srcdoc.tpp/PrintArea$en-us.tpp
rename to uppsrc/Report/srcdoc.tpp/PrintArea_en-us.tpp
diff --git a/uppsrc/ScatterCtrl/src.tpp/MouseBehavior$en-us.tppi b/uppsrc/ScatterCtrl/src.tpp/MouseBehavior_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterCtrl/src.tpp/MouseBehavior$en-us.tppi
rename to uppsrc/ScatterCtrl/src.tpp/MouseBehavior_en-us.tppi
diff --git a/uppsrc/ScatterCtrl/src.tpp/ScatterCtrl$en-us.tpp b/uppsrc/ScatterCtrl/src.tpp/ScatterCtrl_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterCtrl/src.tpp/ScatterCtrl$en-us.tpp
rename to uppsrc/ScatterCtrl/src.tpp/ScatterCtrl_en-us.tpp
diff --git a/uppsrc/ScatterCtrl/src.tpp/ScatterCtrl$en-us.tppi b/uppsrc/ScatterCtrl/src.tpp/ScatterCtrl_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterCtrl/src.tpp/ScatterCtrl$en-us.tppi
rename to uppsrc/ScatterCtrl/src.tpp/ScatterCtrl_en-us.tppi
diff --git a/uppsrc/ScatterCtrl/src.tpp/all.i b/uppsrc/ScatterCtrl/src.tpp/all.i
index b15b3ef5e..75b592cdb 100644
--- a/uppsrc/ScatterCtrl/src.tpp/all.i
+++ b/uppsrc/ScatterCtrl/src.tpp/all.i
@@ -1,8 +1,8 @@
-TOPIC("MouseBehavior$en-us")
-#include "MouseBehavior$en-us.tppi"
+TOPIC("MouseBehavior_en-us")
+#include "MouseBehavior_en-us.tppi"
 END_TOPIC
 
-TOPIC("ScatterCtrl$en-us")
-#include "ScatterCtrl$en-us.tppi"
+TOPIC("ScatterCtrl_en-us")
+#include "ScatterCtrl_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Data$en-us.tpp b/uppsrc/ScatterCtrl/srcdoc.tpp/Data_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Data$en-us.tpp
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Data_en-us.tpp
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Data$en-us.tppi b/uppsrc/ScatterCtrl/srcdoc.tpp/Data_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Data$en-us.tppi
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Data_en-us.tppi
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Process$en-us.tpp b/uppsrc/ScatterCtrl/srcdoc.tpp/Process_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Process$en-us.tpp
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Process_en-us.tpp
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Process$en-us.tppi b/uppsrc/ScatterCtrl/srcdoc.tpp/Process_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Process$en-us.tppi
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Process_en-us.tppi
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Properties$en-us.tpp b/uppsrc/ScatterCtrl/srcdoc.tpp/Properties_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Properties$en-us.tpp
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Properties_en-us.tpp
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/Properties$en-us.tppi b/uppsrc/ScatterCtrl/srcdoc.tpp/Properties_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterCtrl/srcdoc.tpp/Properties$en-us.tppi
rename to uppsrc/ScatterCtrl/srcdoc.tpp/Properties_en-us.tppi
diff --git a/uppsrc/ScatterCtrl/srcdoc.tpp/all.i b/uppsrc/ScatterCtrl/srcdoc.tpp/all.i
index a86826e03..6969d4dd1 100644
--- a/uppsrc/ScatterCtrl/srcdoc.tpp/all.i
+++ b/uppsrc/ScatterCtrl/srcdoc.tpp/all.i
@@ -1,12 +1,12 @@
-TOPIC("Data$en-us")
-#include "Data$en-us.tppi"
+TOPIC("Data_en-us")
+#include "Data_en-us.tppi"
 END_TOPIC
 
-TOPIC("Process$en-us")
-#include "Process$en-us.tppi"
+TOPIC("Process_en-us")
+#include "Process_en-us.tppi"
 END_TOPIC
 
-TOPIC("Properties$en-us")
-#include "Properties$en-us.tppi"
+TOPIC("Properties_en-us")
+#include "Properties_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ScatterDraw/src.tpp/CArray$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/CArray_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/CArray$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/CArray_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/CArray$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/CArray_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/CArray$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/CArray_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/DataSource$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/DataSource_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/DataSource$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/DataSource_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/DataSource$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/DataSource_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/DataSource$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/DataSource_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/EvalExpr$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/EvalExpr_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/EvalExpr$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/EvalExpr_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/EvalExpr$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/EvalExpr_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/EvalExpr$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/EvalExpr_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/ExplicitEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/ExplicitEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ExplicitEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/ExplicitEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/ExplicitEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/ExplicitEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ExplicitEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/ExplicitEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/ExponentialEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/ExponentialEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ExponentialEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/ExponentialEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/ExponentialEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/ExponentialEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ExponentialEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/ExponentialEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/FourierEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/FourierEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/FourierEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/FourierEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/FourierEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/FourierEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/FourierEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/FourierEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/LinearEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/LinearEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/LinearEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/LinearEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/LinearEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/LinearEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/LinearEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/LinearEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/PolynomialEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/PolynomialEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/PolynomialEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/PolynomialEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/PolynomialEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/PolynomialEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/PolynomialEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/PolynomialEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/Rational1Equation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/Rational1Equation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/Rational1Equation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/Rational1Equation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/Rational1Equation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/Rational1Equation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/Rational1Equation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/Rational1Equation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/RealExponentEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/RealExponentEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/RealExponentEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/RealExponentEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/RealExponentEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/RealExponentEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/RealExponentEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/RealExponentEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/ScatterDraw$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ScatterDraw$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/ScatterDraw$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/ScatterDraw$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/ScatterDraw_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/SinEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/SinEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/SinEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/SinEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/SinEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/SinEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/SinEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/SinEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/UserEquation$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/UserEquation_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/UserEquation$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/UserEquation_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/UserEquation$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/UserEquation_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/UserEquation$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/UserEquation_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/VectorY$en-us.tpp b/uppsrc/ScatterDraw/src.tpp/VectorY_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/VectorY$en-us.tpp
rename to uppsrc/ScatterDraw/src.tpp/VectorY_en-us.tpp
diff --git a/uppsrc/ScatterDraw/src.tpp/VectorY$en-us.tppi b/uppsrc/ScatterDraw/src.tpp/VectorY_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/src.tpp/VectorY$en-us.tppi
rename to uppsrc/ScatterDraw/src.tpp/VectorY_en-us.tppi
diff --git a/uppsrc/ScatterDraw/src.tpp/all.i b/uppsrc/ScatterDraw/src.tpp/all.i
index 162789785..55cb63488 100644
--- a/uppsrc/ScatterDraw/src.tpp/all.i
+++ b/uppsrc/ScatterDraw/src.tpp/all.i
@@ -1,56 +1,56 @@
-TOPIC("CArray$en-us")
-#include "CArray$en-us.tppi"
+TOPIC("CArray_en-us")
+#include "CArray_en-us.tppi"
 END_TOPIC
 
-TOPIC("DataSource$en-us")
-#include "DataSource$en-us.tppi"
+TOPIC("DataSource_en-us")
+#include "DataSource_en-us.tppi"
 END_TOPIC
 
-TOPIC("EvalExpr$en-us")
-#include "EvalExpr$en-us.tppi"
+TOPIC("EvalExpr_en-us")
+#include "EvalExpr_en-us.tppi"
 END_TOPIC
 
-TOPIC("ExplicitEquation$en-us")
-#include "ExplicitEquation$en-us.tppi"
+TOPIC("ExplicitEquation_en-us")
+#include "ExplicitEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("ExponentialEquation$en-us")
-#include "ExponentialEquation$en-us.tppi"
+TOPIC("ExponentialEquation_en-us")
+#include "ExponentialEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("FourierEquation$en-us")
-#include "FourierEquation$en-us.tppi"
+TOPIC("FourierEquation_en-us")
+#include "FourierEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("LinearEquation$en-us")
-#include "LinearEquation$en-us.tppi"
+TOPIC("LinearEquation_en-us")
+#include "LinearEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("PolynomialEquation$en-us")
-#include "PolynomialEquation$en-us.tppi"
+TOPIC("PolynomialEquation_en-us")
+#include "PolynomialEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("Rational1Equation$en-us")
-#include "Rational1Equation$en-us.tppi"
+TOPIC("Rational1Equation_en-us")
+#include "Rational1Equation_en-us.tppi"
 END_TOPIC
 
-TOPIC("RealExponentEquation$en-us")
-#include "RealExponentEquation$en-us.tppi"
+TOPIC("RealExponentEquation_en-us")
+#include "RealExponentEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("ScatterDraw$en-us")
-#include "ScatterDraw$en-us.tppi"
+TOPIC("ScatterDraw_en-us")
+#include "ScatterDraw_en-us.tppi"
 END_TOPIC
 
-TOPIC("SinEquation$en-us")
-#include "SinEquation$en-us.tppi"
+TOPIC("SinEquation_en-us")
+#include "SinEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("UserEquation$en-us")
-#include "UserEquation$en-us.tppi"
+TOPIC("UserEquation_en-us")
+#include "UserEquation_en-us.tppi"
 END_TOPIC
 
-TOPIC("VectorY$en-us")
-#include "VectorY$en-us.tppi"
+TOPIC("VectorY_en-us")
+#include "VectorY_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/LegendTable$en-us.tpp b/uppsrc/ScatterDraw/srcdoc.tpp/LegendTable_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/LegendTable$en-us.tpp
rename to uppsrc/ScatterDraw/srcdoc.tpp/LegendTable_en-us.tpp
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/LegendTable$en-us.tppi b/uppsrc/ScatterDraw/srcdoc.tpp/LegendTable_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/LegendTable$en-us.tppi
rename to uppsrc/ScatterDraw/srcdoc.tpp/LegendTable_en-us.tppi
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/Overview$en-us.tpp b/uppsrc/ScatterDraw/srcdoc.tpp/Overview_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/Overview$en-us.tpp
rename to uppsrc/ScatterDraw/srcdoc.tpp/Overview_en-us.tpp
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/Overview$en-us.tppi b/uppsrc/ScatterDraw/srcdoc.tpp/Overview_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/Overview$en-us.tppi
rename to uppsrc/ScatterDraw/srcdoc.tpp/Overview_en-us.tppi
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/Units$en-us.tpp b/uppsrc/ScatterDraw/srcdoc.tpp/Units_en-us.tpp
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/Units$en-us.tpp
rename to uppsrc/ScatterDraw/srcdoc.tpp/Units_en-us.tpp
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/Units$en-us.tppi b/uppsrc/ScatterDraw/srcdoc.tpp/Units_en-us.tppi
similarity index 100%
rename from uppsrc/ScatterDraw/srcdoc.tpp/Units$en-us.tppi
rename to uppsrc/ScatterDraw/srcdoc.tpp/Units_en-us.tppi
diff --git a/uppsrc/ScatterDraw/srcdoc.tpp/all.i b/uppsrc/ScatterDraw/srcdoc.tpp/all.i
index d6a8cb682..8865443da 100644
--- a/uppsrc/ScatterDraw/srcdoc.tpp/all.i
+++ b/uppsrc/ScatterDraw/srcdoc.tpp/all.i
@@ -1,12 +1,12 @@
-TOPIC("LegendTable$en-us")
-#include "LegendTable$en-us.tppi"
+TOPIC("LegendTable_en-us")
+#include "LegendTable_en-us.tppi"
 END_TOPIC
 
-TOPIC("Overview$en-us")
-#include "Overview$en-us.tppi"
+TOPIC("Overview_en-us")
+#include "Overview_en-us.tppi"
 END_TOPIC
 
-TOPIC("Units$en-us")
-#include "Units$en-us.tppi"
+TOPIC("Units_en-us")
+#include "Units_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/Skylark/src.tpp/Config$en-us.tpp b/uppsrc/Skylark/src.tpp/Config_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Config$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Config_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Deploy$en-us.tpp b/uppsrc/Skylark/src.tpp/Deploy_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Deploy$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Deploy_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Handler$en-us.tpp b/uppsrc/Skylark/src.tpp/Handler_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Handler$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Handler_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Http$en-us.tpp b/uppsrc/Skylark/src.tpp/Http_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Http$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Http_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Renderer$en-us.tpp b/uppsrc/Skylark/src.tpp/Renderer_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Renderer$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Renderer_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/SharedVariables$en-us.tpp b/uppsrc/Skylark/src.tpp/SharedVariables_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/SharedVariables$en-us.tpp
rename to uppsrc/Skylark/src.tpp/SharedVariables_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp b/uppsrc/Skylark/src.tpp/SkylarkApp_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp
rename to uppsrc/Skylark/src.tpp/SkylarkApp_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Static$en-us.tpp b/uppsrc/Skylark/src.tpp/Static_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Static$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Static_en-us.tpp
diff --git a/uppsrc/Skylark/src.tpp/Witz$en-us.tpp b/uppsrc/Skylark/src.tpp/Witz_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/src.tpp/Witz$en-us.tpp
rename to uppsrc/Skylark/src.tpp/Witz_en-us.tpp
diff --git a/uppsrc/Skylark/srcdoc.tpp/Tutorial$en-us.tpp b/uppsrc/Skylark/srcdoc.tpp/Tutorial_en-us.tpp
similarity index 100%
rename from uppsrc/Skylark/srcdoc.tpp/Tutorial$en-us.tpp
rename to uppsrc/Skylark/srcdoc.tpp/Tutorial_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/S_type$en-us.tpp b/uppsrc/Sql/src.tpp/S_type_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/S_type$en-us.tpp
rename to uppsrc/Sql/src.tpp/S_type_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlColumnInfo$en-us.tpp b/uppsrc/Sql/src.tpp/SqlColumnInfo_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlColumnInfo$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlColumnInfo_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp b/uppsrc/Sql/src.tpp/SqlExp_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlExp$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlExp_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlMassInsert$en-us.tpp b/uppsrc/Sql/src.tpp/SqlMassInsert_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlMassInsert$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlMassInsert_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlRaw$en-us.tpp b/uppsrc/Sql/src.tpp/SqlRaw_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlRaw$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlRaw_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlSchema$en-us.tpp b/uppsrc/Sql/src.tpp/SqlSchema_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlSchema$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlSchema_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/SqlSession$en-us.tpp b/uppsrc/Sql/src.tpp/SqlSession_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/SqlSession$en-us.tpp
rename to uppsrc/Sql/src.tpp/SqlSession_en-us.tpp
diff --git a/uppsrc/Sql/src.tpp/Sql$en-us.tpp b/uppsrc/Sql/src.tpp/Sql_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/src.tpp/Sql$en-us.tpp
rename to uppsrc/Sql/src.tpp/Sql_en-us.tpp
diff --git a/uppsrc/Sql/srcdoc.tpp/BasicUse$en-us.tpp b/uppsrc/Sql/srcdoc.tpp/BasicUse_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/srcdoc.tpp/BasicUse$en-us.tpp
rename to uppsrc/Sql/srcdoc.tpp/BasicUse_en-us.tpp
diff --git a/uppsrc/Sql/srcdoc.tpp/IncrementalDevelopment$en-us.tpp b/uppsrc/Sql/srcdoc.tpp/IncrementalDevelopment_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/srcdoc.tpp/IncrementalDevelopment$en-us.tpp
rename to uppsrc/Sql/srcdoc.tpp/IncrementalDevelopment_en-us.tpp
diff --git a/uppsrc/Sql/srcdoc.tpp/index$en-us.tpp b/uppsrc/Sql/srcdoc.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/srcdoc.tpp/index$en-us.tpp
rename to uppsrc/Sql/srcdoc.tpp/index_en-us.tpp
diff --git a/uppsrc/Sql/srcdoc.tpp/tutorial$en-us.tpp b/uppsrc/Sql/srcdoc.tpp/tutorial_en-us.tpp
similarity index 100%
rename from uppsrc/Sql/srcdoc.tpp/tutorial$en-us.tpp
rename to uppsrc/Sql/srcdoc.tpp/tutorial_en-us.tpp
diff --git a/uppsrc/SqlCtrl/src.tpp/SqlArray$en-us.tpp b/uppsrc/SqlCtrl/src.tpp/SqlArray_en-us.tpp
similarity index 100%
rename from uppsrc/SqlCtrl/src.tpp/SqlArray$en-us.tpp
rename to uppsrc/SqlCtrl/src.tpp/SqlArray_en-us.tpp
diff --git a/uppsrc/SqlCtrl/src.tpp/SqlCtrls$en-us.tpp b/uppsrc/SqlCtrl/src.tpp/SqlCtrls_en-us.tpp
similarity index 100%
rename from uppsrc/SqlCtrl/src.tpp/SqlCtrls$en-us.tpp
rename to uppsrc/SqlCtrl/src.tpp/SqlCtrls_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArith$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcArith_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcArith$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcArith_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArith$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcArith_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcArith$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcArith_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArray$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcArray_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcArray$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcArray_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcArray$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcArray_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcArray$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcArray_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcDate$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcDate_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcDate$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcDate_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcDate$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcDate_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcDate$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcDate_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcLog$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcLog_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcLog$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcLog_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcLog$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcLog_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcLog$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcLog_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcNode$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcNode_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcNode$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcNode_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcNode$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcNode_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcNode$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcNode_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcSys$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcSys_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcSys$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcSys_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcSys$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcSys_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcSys$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcSys_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcText$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcText_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcText$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcText_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcText$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcText_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcText$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcText_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcTrans$cs-cz.tpp b/uppsrc/TCore/appdoc.tpp/CalcTrans_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcTrans$cs-cz.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcTrans_cs-cz.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/CalcTrans$en-us.tpp b/uppsrc/TCore/appdoc.tpp/CalcTrans_en-us.tpp
similarity index 100%
rename from uppsrc/TCore/appdoc.tpp/CalcTrans$en-us.tpp
rename to uppsrc/TCore/appdoc.tpp/CalcTrans_en-us.tpp
diff --git a/uppsrc/TCore/appdoc.tpp/all.i b/uppsrc/TCore/appdoc.tpp/all.i
index e44f64fb3..f21a3eda3 100644
--- a/uppsrc/TCore/appdoc.tpp/all.i
+++ b/uppsrc/TCore/appdoc.tpp/all.i
@@ -1,63 +1,63 @@
-TOPIC("CalcNode$cs-cz")
-#include "CalcNode$cs-cz.tpp"
+TOPIC("CalcNode_cs-cz")
+#include "CalcNode_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcNode$en-us")
-#include "CalcNode$en-us.tpp"
+TOPIC("CalcNode_en-us")
+#include "CalcNode_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcArith$cs-cz")
-#include "CalcArith$cs-cz.tpp"
+TOPIC("CalcArith_cs-cz")
+#include "CalcArith_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcArray$cs-cz")
-#include "CalcArray$cs-cz.tpp"
+TOPIC("CalcArray_cs-cz")
+#include "CalcArray_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcTrans$cs-cz")
-#include "CalcTrans$cs-cz.tpp"
+TOPIC("CalcTrans_cs-cz")
+#include "CalcTrans_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcText$cs-cz")
-#include "CalcText$cs-cz.tpp"
+TOPIC("CalcText_cs-cz")
+#include "CalcText_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcDate$cs-cz")
-#include "CalcDate$cs-cz.tpp"
+TOPIC("CalcDate_cs-cz")
+#include "CalcDate_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcLog$cs-cz")
-#include "CalcLog$cs-cz.tpp"
+TOPIC("CalcLog_cs-cz")
+#include "CalcLog_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcSys$cs-cz")
-#include "CalcSys$cs-cz.tpp"
+TOPIC("CalcSys_cs-cz")
+#include "CalcSys_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcArith$en-us")
-#include "CalcArith$en-us.tpp"
+TOPIC("CalcArith_en-us")
+#include "CalcArith_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcArray$en-us")
-#include "CalcArray$en-us.tpp"
+TOPIC("CalcArray_en-us")
+#include "CalcArray_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcDate$en-us")
-#include "CalcDate$en-us.tpp"
+TOPIC("CalcDate_en-us")
+#include "CalcDate_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcLog$en-us")
-#include "CalcLog$en-us.tpp"
+TOPIC("CalcLog_en-us")
+#include "CalcLog_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcSys$en-us")
-#include "CalcSys$en-us.tpp"
+TOPIC("CalcSys_en-us")
+#include "CalcSys_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcText$en-us")
-#include "CalcText$en-us.tpp"
+TOPIC("CalcText_en-us")
+#include "CalcText_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcTrans$en-us")
-#include "CalcTrans$en-us.tpp"
+TOPIC("CalcTrans_en-us")
+#include "CalcTrans_en-us.tpp"
 END_TOPIC
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$cs-cz.tpp b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$cs-cz.tpp
rename to uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType_cs-cz.tpp
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$en-us.tpp b/uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType_en-us.tpp
similarity index 100%
rename from uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType$en-us.tpp
rename to uppsrc/TCtrlLib/appdoc.tpp/CalcGuiType_en-us.tpp
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp b/uppsrc/TCtrlLib/appdoc.tpp/DlgCalc_cs-cz.tpp
similarity index 100%
rename from uppsrc/TCtrlLib/appdoc.tpp/DlgCalc$cs-cz.tpp
rename to uppsrc/TCtrlLib/appdoc.tpp/DlgCalc_cs-cz.tpp
diff --git a/uppsrc/TCtrlLib/appdoc.tpp/all.i b/uppsrc/TCtrlLib/appdoc.tpp/all.i
index 634a523e6..d3956d54c 100644
--- a/uppsrc/TCtrlLib/appdoc.tpp/all.i
+++ b/uppsrc/TCtrlLib/appdoc.tpp/all.i
@@ -1,11 +1,11 @@
-TOPIC("DlgCalc$cs-cz")
-#include "DlgCalc$cs-cz.tpp"
+TOPIC("DlgCalc_cs-cz")
+#include "DlgCalc_cs-cz.tpp"
 END_TOPIC
 
-TOPIC("CalcGuiType$en-us")
-#include "CalcGuiType$en-us.tpp"
+TOPIC("CalcGuiType_en-us")
+#include "CalcGuiType_en-us.tpp"
 END_TOPIC
 
-TOPIC("CalcGuiType$cs-cz")
-#include "CalcGuiType$cs-cz.tpp"
+TOPIC("CalcGuiType_cs-cz")
+#include "CalcGuiType_cs-cz.tpp"
 END_TOPIC
diff --git a/uppsrc/Web/SSL/src.tpp/index$en-us.tpp b/uppsrc/Web/SSL/src.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Web/SSL/src.tpp/index$en-us.tpp
rename to uppsrc/Web/SSL/src.tpp/index_en-us.tpp
diff --git a/uppsrc/Web/SSL/srcdoc.tpp/index$en-us.tpp b/uppsrc/Web/SSL/srcdoc.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Web/SSL/srcdoc.tpp/index$en-us.tpp
rename to uppsrc/Web/SSL/srcdoc.tpp/index_en-us.tpp
diff --git a/uppsrc/Web/SSL/srcimp.tpp/index$en-us.tpp b/uppsrc/Web/SSL/srcimp.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Web/SSL/srcimp.tpp/index$en-us.tpp
rename to uppsrc/Web/SSL/srcimp.tpp/index_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/AboutUppSockets$en-us.tpp b/uppsrc/Web/srcdoc.tpp/AboutUppSockets_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/AboutUppSockets$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/AboutUppSockets_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/ConnectionOriented$en-us.tpp b/uppsrc/Web/srcdoc.tpp/ConnectionOriented_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/ConnectionOriented$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/ConnectionOriented_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/MiscSocketInfo$en-us.tpp b/uppsrc/Web/srcdoc.tpp/MiscSocketInfo_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/MiscSocketInfo$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/MiscSocketInfo_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/SocketExample1$en-us.tpp b/uppsrc/Web/srcdoc.tpp/SocketExample1_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/SocketExample1$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/SocketExample1_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/SocketPitfalls$en-us.tpp b/uppsrc/Web/srcdoc.tpp/SocketPitfalls_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/SocketPitfalls$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/SocketPitfalls_en-us.tpp
diff --git a/uppsrc/Web/srcdoc.tpp/index$en-us.tpp b/uppsrc/Web/srcdoc.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcdoc.tpp/index$en-us.tpp
rename to uppsrc/Web/srcdoc.tpp/index_en-us.tpp
diff --git a/uppsrc/Web/srcimp.tpp/index$en-us.tpp b/uppsrc/Web/srcimp.tpp/index_en-us.tpp
similarity index 100%
rename from uppsrc/Web/srcimp.tpp/index$en-us.tpp
rename to uppsrc/Web/srcimp.tpp/index_en-us.tpp
diff --git a/uppsrc/$.tpp/Reference$en-us.tpp b/uppsrc/_.tpp/Reference_en-us.tpp
similarity index 100%
rename from uppsrc/$.tpp/Reference$en-us.tpp
rename to uppsrc/_.tpp/Reference_en-us.tpp
diff --git a/uppsrc/$.tpp/Tutorial$en-us.tpp b/uppsrc/_.tpp/Tutorial_en-us.tpp
similarity index 100%
rename from uppsrc/$.tpp/Tutorial$en-us.tpp
rename to uppsrc/_.tpp/Tutorial_en-us.tpp
diff --git a/uppsrc/ide/Browser/Topic.cpp b/uppsrc/ide/Browser/Topic.cpp
index 78a9b001f..fd89cc5cd 100644
--- a/uppsrc/ide/Browser/Topic.cpp
+++ b/uppsrc/ide/Browser/Topic.cpp
@@ -19,8 +19,18 @@ bool LoadTopics(FileList& topic, const String& grouppath)
 	bool renamed = false;
 	for(int pass = 0; pass < 2; pass++) {
 		topic.Clear();
-		FindFile ff(AppendFileName(grouppath, "*.tpp"));
+		FindFile ff(AppendFileName(grouppath, "*.*"));
 		while(ff) {
+			if(ff.IsFile() && GetFileExt(ff.GetName()) == ".tppi") {
+				String n = ff.GetName();
+				int q = n.ReverseFind('$');
+				if(q >= 0 && q > n.GetLength() - 12) {
+					String nn = n;
+					n.Set(q, '_');
+					FileMove(AppendFileName(grouppath, nn), AppendFileName(grouppath, n));
+					renamed = true;
+				}
+			}
 			if(ff.IsFile() && GetFileExt(ff.GetName()) == ".tpp") {
 				String n = ff.GetName();
 				int q = n.ReverseFind('$');
diff --git a/uppsrc/ide/Debuggers/app.tpp/PDBExpressions$en-us.tppi b/uppsrc/ide/Debuggers/app.tpp/PDBExpressions_en-us.tppi
similarity index 100%
rename from uppsrc/ide/Debuggers/app.tpp/PDBExpressions$en-us.tppi
rename to uppsrc/ide/Debuggers/app.tpp/PDBExpressions_en-us.tppi
diff --git a/uppsrc/ide/Debuggers/app.tpp/all.i b/uppsrc/ide/Debuggers/app.tpp/all.i
index 37187f329..b9138568b 100644
--- a/uppsrc/ide/Debuggers/app.tpp/all.i
+++ b/uppsrc/ide/Debuggers/app.tpp/all.i
@@ -1,4 +1,4 @@
-TOPIC("PDBExpressions$en-us")
-#include "PDBExpressions$en-us.tppi"
+TOPIC("PDBExpressions_en-us")
+#include "PDBExpressions_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/InstallWizard$en-us.tppi b/uppsrc/ide/SrcUpdater/app.tpp/InstallWizard_en-us.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/InstallWizard$en-us.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/InstallWizard_en-us.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/InstallWizard$ru-ru.tppi b/uppsrc/ide/SrcUpdater/app.tpp/InstallWizard_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/InstallWizard$ru-ru.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/InstallWizard_ru-ru.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide$en-us.tppi b/uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide_en-us.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide$en-us.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide_en-us.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide$ru-ru.tppi b/uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide$ru-ru.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/LinuxInstallGuide_ru-ru.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/Uninstall$en-us.tppi b/uppsrc/ide/SrcUpdater/app.tpp/Uninstall_en-us.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/Uninstall$en-us.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/Uninstall_en-us.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/Uninstall$ru-ru.tppi b/uppsrc/ide/SrcUpdater/app.tpp/Uninstall_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/Uninstall$ru-ru.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/Uninstall_ru-ru.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/Updating$en-us.tppi b/uppsrc/ide/SrcUpdater/app.tpp/Updating_en-us.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/Updating$en-us.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/Updating_en-us.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/Updating$ru-ru.tppi b/uppsrc/ide/SrcUpdater/app.tpp/Updating_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/SrcUpdater/app.tpp/Updating$ru-ru.tppi
rename to uppsrc/ide/SrcUpdater/app.tpp/Updating_ru-ru.tppi
diff --git a/uppsrc/ide/SrcUpdater/app.tpp/all.i b/uppsrc/ide/SrcUpdater/app.tpp/all.i
index 14025f290..9288c056b 100644
--- a/uppsrc/ide/SrcUpdater/app.tpp/all.i
+++ b/uppsrc/ide/SrcUpdater/app.tpp/all.i
@@ -1,32 +1,32 @@
-TOPIC("InstallWizard$en-us")
-#include "InstallWizard$en-us.tppi"
+TOPIC("InstallWizard_en-us")
+#include "InstallWizard_en-us.tppi"
 END_TOPIC
 
-TOPIC("InstallWizard$ru-ru")
-#include "InstallWizard$ru-ru.tppi"
+TOPIC("InstallWizard_ru-ru")
+#include "InstallWizard_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("LinuxInstallGuide$en-us")
-#include "LinuxInstallGuide$en-us.tppi"
+TOPIC("LinuxInstallGuide_en-us")
+#include "LinuxInstallGuide_en-us.tppi"
 END_TOPIC
 
-TOPIC("LinuxInstallGuide$ru-ru")
-#include "LinuxInstallGuide$ru-ru.tppi"
+TOPIC("LinuxInstallGuide_ru-ru")
+#include "LinuxInstallGuide_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("Uninstall$en-us")
-#include "Uninstall$en-us.tppi"
+TOPIC("Uninstall_en-us")
+#include "Uninstall_en-us.tppi"
 END_TOPIC
 
-TOPIC("Uninstall$ru-ru")
-#include "Uninstall$ru-ru.tppi"
+TOPIC("Uninstall_ru-ru")
+#include "Uninstall_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("Updating$en-us")
-#include "Updating$en-us.tppi"
+TOPIC("Updating_en-us")
+#include "Updating_en-us.tppi"
 END_TOPIC
 
-TOPIC("Updating$ru-ru")
-#include "Updating$ru-ru.tppi"
+TOPIC("Updating_ru-ru")
+#include "Updating_ru-ru.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ide/app.tpp/About$en-us.tppi b/uppsrc/ide/app.tpp/About_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/About$en-us.tppi
rename to uppsrc/ide/app.tpp/About_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/AdvancedReplace$en-us.tppi b/uppsrc/ide/app.tpp/AdvancedReplace_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/AdvancedReplace$en-us.tppi
rename to uppsrc/ide/app.tpp/AdvancedReplace_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/AndroidBuilder$en-us.tppi b/uppsrc/ide/app.tpp/AndroidBuilder_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/AndroidBuilder$en-us.tppi
rename to uppsrc/ide/app.tpp/AndroidBuilder_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Assist$en-us.tppi b/uppsrc/ide/app.tpp/Assist_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Assist$en-us.tppi
rename to uppsrc/ide/app.tpp/Assist_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/BSD$en-us.tppi b/uppsrc/ide/app.tpp/BSD_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/BSD$en-us.tppi
rename to uppsrc/ide/app.tpp/BSD_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Blitz$en-us.tppi b/uppsrc/ide/app.tpp/Blitz_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Blitz$en-us.tppi
rename to uppsrc/ide/app.tpp/Blitz_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies$en-us.tppi b/uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies$en-us.tppi
rename to uppsrc/ide/app.tpp/ConfiguringPackagesAssemblies_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Contact$en-us.tppi b/uppsrc/ide/app.tpp/Contact_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Contact$en-us.tppi
rename to uppsrc/ide/app.tpp/Contact_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Cpp$en-us.tppi b/uppsrc/ide/app.tpp/Cpp_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Cpp$en-us.tppi
rename to uppsrc/ide/app.tpp/Cpp_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/CrossComp$en-gb.tppi b/uppsrc/ide/app.tpp/CrossComp_en-gb.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/CrossComp$en-gb.tppi
rename to uppsrc/ide/app.tpp/CrossComp_en-gb.tppi
diff --git a/uppsrc/ide/app.tpp/Files$en-us.tppi b/uppsrc/ide/app.tpp/Files_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Files$en-us.tppi
rename to uppsrc/ide/app.tpp/Files_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/FindFile$en-us.tppi b/uppsrc/ide/app.tpp/FindFile_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/FindFile$en-us.tppi
rename to uppsrc/ide/app.tpp/FindFile_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Flags$en-us.tppi b/uppsrc/ide/app.tpp/Flags_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Flags$en-us.tppi
rename to uppsrc/ide/app.tpp/Flags_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/GPL$en-us.tppi b/uppsrc/ide/app.tpp/GPL_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/GPL$en-us.tppi
rename to uppsrc/ide/app.tpp/GPL_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/GettingStarted$en-us.tppi b/uppsrc/ide/app.tpp/GettingStarted_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/GettingStarted$en-us.tppi
rename to uppsrc/ide/app.tpp/GettingStarted_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/GettingStarted$ru-ru.tppi b/uppsrc/ide/app.tpp/GettingStarted_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/GettingStarted$ru-ru.tppi
rename to uppsrc/ide/app.tpp/GettingStarted_ru-ru.tppi
diff --git a/uppsrc/ide/app.tpp/IconDes$en-us.tppi b/uppsrc/ide/app.tpp/IconDes_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/IconDes$en-us.tppi
rename to uppsrc/ide/app.tpp/IconDes_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/IntroductionToUPP$en-us.tppi b/uppsrc/ide/app.tpp/IntroductionToUPP_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/IntroductionToUPP$en-us.tppi
rename to uppsrc/ide/app.tpp/IntroductionToUPP_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Keys$en-us.tppi b/uppsrc/ide/app.tpp/Keys_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Keys$en-us.tppi
rename to uppsrc/ide/app.tpp/Keys_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/NewProject$en-us.tppi b/uppsrc/ide/app.tpp/NewProject_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/NewProject$en-us.tppi
rename to uppsrc/ide/app.tpp/NewProject_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/PackageTemplates$en-us.tppi b/uppsrc/ide/app.tpp/PackageTemplates_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/PackageTemplates$en-us.tppi
rename to uppsrc/ide/app.tpp/PackageTemplates_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/PackagesAssembliesAndNests$en-us.tppi b/uppsrc/ide/app.tpp/PackagesAssembliesAndNests_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/PackagesAssembliesAndNests$en-us.tppi
rename to uppsrc/ide/app.tpp/PackagesAssembliesAndNests_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/PackagesAssembliesAndNests$ru-ru.tppi b/uppsrc/ide/app.tpp/PackagesAssembliesAndNests_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/PackagesAssembliesAndNests$ru-ru.tppi
rename to uppsrc/ide/app.tpp/PackagesAssembliesAndNests_ru-ru.tppi
diff --git a/uppsrc/ide/app.tpp/Sponsor$en-us.tppi b/uppsrc/ide/app.tpp/Sponsor_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Sponsor$en-us.tppi
rename to uppsrc/ide/app.tpp/Sponsor_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/Topic$en-us.tppi b/uppsrc/ide/app.tpp/Topic_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/Topic$en-us.tppi
rename to uppsrc/ide/app.tpp/Topic_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/all.i b/uppsrc/ide/app.tpp/all.i
index 22c9291ab..936d749ce 100644
--- a/uppsrc/ide/app.tpp/all.i
+++ b/uppsrc/ide/app.tpp/all.i
@@ -1,144 +1,144 @@
-TOPIC("About$en-us")
-#include "About$en-us.tppi"
+TOPIC("About_en-us")
+#include "About_en-us.tppi"
 END_TOPIC
 
-TOPIC("AdvancedReplace$en-us")
-#include "AdvancedReplace$en-us.tppi"
+TOPIC("AdvancedReplace_en-us")
+#include "AdvancedReplace_en-us.tppi"
 END_TOPIC
 
-TOPIC("AndroidBuilder$en-us")
-#include "AndroidBuilder$en-us.tppi"
+TOPIC("AndroidBuilder_en-us")
+#include "AndroidBuilder_en-us.tppi"
 END_TOPIC
 
-TOPIC("Assist$en-us")
-#include "Assist$en-us.tppi"
+TOPIC("Assist_en-us")
+#include "Assist_en-us.tppi"
 END_TOPIC
 
-TOPIC("BSD$en-us")
-#include "BSD$en-us.tppi"
+TOPIC("BSD_en-us")
+#include "BSD_en-us.tppi"
 END_TOPIC
 
-TOPIC("Blitz$en-us")
-#include "Blitz$en-us.tppi"
+TOPIC("Blitz_en-us")
+#include "Blitz_en-us.tppi"
 END_TOPIC
 
-TOPIC("ConfiguringPackagesAssemblies$en-us")
-#include "ConfiguringPackagesAssemblies$en-us.tppi"
+TOPIC("ConfiguringPackagesAssemblies_en-us")
+#include "ConfiguringPackagesAssemblies_en-us.tppi"
 END_TOPIC
 
-TOPIC("Contact$en-us")
-#include "Contact$en-us.tppi"
+TOPIC("Contact_en-us")
+#include "Contact_en-us.tppi"
 END_TOPIC
 
-TOPIC("Cpp$en-us")
-#include "Cpp$en-us.tppi"
+TOPIC("Cpp_en-us")
+#include "Cpp_en-us.tppi"
 END_TOPIC
 
-TOPIC("CrossComp$en-gb")
-#include "CrossComp$en-gb.tppi"
+TOPIC("CrossComp_en-gb")
+#include "CrossComp_en-gb.tppi"
 END_TOPIC
 
-TOPIC("Files$en-us")
-#include "Files$en-us.tppi"
+TOPIC("Files_en-us")
+#include "Files_en-us.tppi"
 END_TOPIC
 
-TOPIC("FindFile$en-us")
-#include "FindFile$en-us.tppi"
+TOPIC("FindFile_en-us")
+#include "FindFile_en-us.tppi"
 END_TOPIC
 
-TOPIC("Flags$en-us")
-#include "Flags$en-us.tppi"
+TOPIC("Flags_en-us")
+#include "Flags_en-us.tppi"
 END_TOPIC
 
-TOPIC("GPL$en-us")
-#include "GPL$en-us.tppi"
+TOPIC("GPL_en-us")
+#include "GPL_en-us.tppi"
 END_TOPIC
 
-TOPIC("GettingStarted$en-us")
-#include "GettingStarted$en-us.tppi"
+TOPIC("GettingStarted_en-us")
+#include "GettingStarted_en-us.tppi"
 END_TOPIC
 
-TOPIC("GettingStarted$ru-ru")
-#include "GettingStarted$ru-ru.tppi"
+TOPIC("GettingStarted_ru-ru")
+#include "GettingStarted_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("IconDes$en-us")
-#include "IconDes$en-us.tppi"
+TOPIC("IconDes_en-us")
+#include "IconDes_en-us.tppi"
 END_TOPIC
 
-TOPIC("IntroductionToUPP$en-us")
-#include "IntroductionToUPP$en-us.tppi"
+TOPIC("IntroductionToUPP_en-us")
+#include "IntroductionToUPP_en-us.tppi"
 END_TOPIC
 
-TOPIC("Keys$en-us")
-#include "Keys$en-us.tppi"
+TOPIC("Keys_en-us")
+#include "Keys_en-us.tppi"
 END_TOPIC
 
-TOPIC("NewProject$en-us")
-#include "NewProject$en-us.tppi"
+TOPIC("NewProject_en-us")
+#include "NewProject_en-us.tppi"
 END_TOPIC
 
-TOPIC("PackageTemplates$en-us")
-#include "PackageTemplates$en-us.tppi"
+TOPIC("PackageTemplates_en-us")
+#include "PackageTemplates_en-us.tppi"
 END_TOPIC
 
-TOPIC("PackagesAssembliesAndNests$en-us")
-#include "PackagesAssembliesAndNests$en-us.tppi"
+TOPIC("PackagesAssembliesAndNests_en-us")
+#include "PackagesAssembliesAndNests_en-us.tppi"
 END_TOPIC
 
-TOPIC("PackagesAssembliesAndNests$ru-ru")
-#include "PackagesAssembliesAndNests$ru-ru.tppi"
+TOPIC("PackagesAssembliesAndNests_ru-ru")
+#include "PackagesAssembliesAndNests_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("Sponsor$en-us")
-#include "Sponsor$en-us.tppi"
+TOPIC("Sponsor_en-us")
+#include "Sponsor_en-us.tppi"
 END_TOPIC
 
-TOPIC("Topic$en-us")
-#include "Topic$en-us.tppi"
+TOPIC("Topic_en-us")
+#include "Topic_en-us.tppi"
 END_TOPIC
 
-TOPIC("cmdline$en-us")
-#include "cmdline$en-us.tppi"
+TOPIC("cmdline_en-us")
+#include "cmdline_en-us.tppi"
 END_TOPIC
 
-TOPIC("esc$en-us")
-#include "esc$en-us.tppi"
+TOPIC("esc_en-us")
+#include "esc_en-us.tppi"
 END_TOPIC
 
-TOPIC("importext$en-us")
-#include "importext$en-us.tppi"
+TOPIC("importext_en-us")
+#include "importext_en-us.tppi"
 END_TOPIC
 
-TOPIC("index$en-us")
-#include "index$en-us.tppi"
+TOPIC("index_en-us")
+#include "index_en-us.tppi"
 END_TOPIC
 
-TOPIC("index$ru-ru")
-#include "index$ru-ru.tppi"
+TOPIC("index_ru-ru")
+#include "index_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("install$en-us")
-#include "install$en-us.tppi"
+TOPIC("install_en-us")
+#include "install_en-us.tppi"
 END_TOPIC
 
-TOPIC("install$ru-ru")
-#include "install$ru-ru.tppi"
+TOPIC("install_ru-ru")
+#include "install_ru-ru.tppi"
 END_TOPIC
 
-TOPIC("macros$en-us")
-#include "macros$en-us.tppi"
+TOPIC("macros_en-us")
+#include "macros_en-us.tppi"
 END_TOPIC
 
-TOPIC("special$en-us")
-#include "special$en-us.tppi"
+TOPIC("special_en-us")
+#include "special_en-us.tppi"
 END_TOPIC
 
-TOPIC("umk$en-us")
-#include "umk$en-us.tppi"
+TOPIC("umk_en-us")
+#include "umk_en-us.tppi"
 END_TOPIC
 
-TOPIC("upp$en-us")
-#include "upp$en-us.tppi"
+TOPIC("upp_en-us")
+#include "upp_en-us.tppi"
 END_TOPIC
 
diff --git a/uppsrc/ide/app.tpp/cmdline$en-us.tppi b/uppsrc/ide/app.tpp/cmdline_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/cmdline$en-us.tppi
rename to uppsrc/ide/app.tpp/cmdline_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/esc$en-us.tppi b/uppsrc/ide/app.tpp/esc_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/esc$en-us.tppi
rename to uppsrc/ide/app.tpp/esc_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/importext$en-us.tppi b/uppsrc/ide/app.tpp/importext_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/importext$en-us.tppi
rename to uppsrc/ide/app.tpp/importext_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/index$en-us.tppi b/uppsrc/ide/app.tpp/index_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/index$en-us.tppi
rename to uppsrc/ide/app.tpp/index_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/index$ru-ru.tppi b/uppsrc/ide/app.tpp/index_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/index$ru-ru.tppi
rename to uppsrc/ide/app.tpp/index_ru-ru.tppi
diff --git a/uppsrc/ide/app.tpp/install$en-us.tppi b/uppsrc/ide/app.tpp/install_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/install$en-us.tppi
rename to uppsrc/ide/app.tpp/install_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/install$ru-ru.tppi b/uppsrc/ide/app.tpp/install_ru-ru.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/install$ru-ru.tppi
rename to uppsrc/ide/app.tpp/install_ru-ru.tppi
diff --git a/uppsrc/ide/app.tpp/macros$en-us.tppi b/uppsrc/ide/app.tpp/macros_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/macros$en-us.tppi
rename to uppsrc/ide/app.tpp/macros_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/special$en-us.tppi b/uppsrc/ide/app.tpp/special_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/special$en-us.tppi
rename to uppsrc/ide/app.tpp/special_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/umk$en-us.tppi b/uppsrc/ide/app.tpp/umk_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/umk$en-us.tppi
rename to uppsrc/ide/app.tpp/umk_en-us.tppi
diff --git a/uppsrc/ide/app.tpp/upp$en-us.tppi b/uppsrc/ide/app.tpp/upp_en-us.tppi
similarity index 100%
rename from uppsrc/ide/app.tpp/upp$en-us.tppi
rename to uppsrc/ide/app.tpp/upp_en-us.tppi
diff --git a/uppsrc/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp b/uppsrc/plugin/Eigen/srcdoc.tpp/Eigen_en-us.tpp
similarity index 100%
rename from uppsrc/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp
rename to uppsrc/plugin/Eigen/srcdoc.tpp/Eigen_en-us.tpp
diff --git a/uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp b/uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear_en-us.tpp
similarity index 100%
rename from uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp
rename to uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear_en-us.tpp