diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h
index c62b9ad97..e4624f502 100644
--- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h
+++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h
@@ -21,9 +21,9 @@ struct ScatterDemo : StaticRect {
  
 void RegisterExample(const char *name, ScatterDemo* (*ctrl)(), String fileName);
 
-class Tab1 : public WithTab1<ScatterDemo> {
+class Tab1_Basic : public WithTab1Basic<ScatterDemo> {
 public:
-	typedef Tab1 CLASSNAME;
+	typedef Tab1_Basic CLASSNAME;
 	
 	virtual void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
@@ -36,9 +36,9 @@ private:
 	VectorMap<double, double> s5;
 };
 
-class Tab2 : public WithTab2<ScatterDemo> {
+class Tab2_Functiona : public WithTab2Functions<ScatterDemo> {
 public:
-	typedef Tab2 CLASSNAME;
+	typedef Tab2_Functiona CLASSNAME;
 	
 	void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
@@ -46,17 +46,17 @@ public:
 	Callback back1, back2, back3;
 };
 
-class Tab3 : public WithTab3<ScatterDemo> {
+class Tab3_ParametricFunctions : public WithTab3ParametricFunctions<ScatterDemo> {
 public:
-	typedef Tab3 CLASSNAME;
+	typedef Tab3_ParametricFunctions CLASSNAME;
 	
 	void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
 };
 
-class Tab4 : public WithTab4<ScatterDemo> {
+class Tab4_Formatting : public WithTab4Formatting<ScatterDemo> {
 public:
-	typedef Tab4 CLASSNAME;
+	typedef Tab4_Formatting CLASSNAME;
 	
 	void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
@@ -65,9 +65,9 @@ private:
 	Vector<Pointf> s1, s2;
 };
 
-class Tab5 : public WithTab5<ScatterDemo> {
+class Tab5_Dynamic : public WithTab5Dynamic<ScatterDemo> {
 public:
-	typedef Tab5 CLASSNAME;
+	typedef Tab5_Dynamic CLASSNAME;
 	
 	void Init();
 	void Animate();
@@ -85,9 +85,9 @@ private:
 	Vector<Pointf> s1, s2;
 };
 
-class Tab6 : public WithTab6<ScatterDemo> {
+class Tab6_Logarithmic : public WithTab6Logarithmic<ScatterDemo> {
 public:
-	typedef Tab6 CLASSNAME;
+	typedef Tab6_Logarithmic CLASSNAME;
 	
 	void Init();
 	void FormatX(String& s, int i, double d);	
@@ -97,9 +97,9 @@ private:
 	Vector<Pointf> s1;
 };
 
-class Tab7 : public WithTab7<ScatterDemo> {
+class Tab7_Operations : public WithTab7Operations<ScatterDemo> {
 public:
-	typedef Tab7 CLASSNAME;
+	typedef Tab7_Operations CLASSNAME;
 	
 	void Init();		
 	void AddSeries();
@@ -112,9 +112,9 @@ private:
 	Array<Vector<Pointf> > series;
 };
 
-class Tab8 : public WithTab8<ScatterDemo> {
+class Tab8_Secondary : public WithTab8Secondary<ScatterDemo> {
 public:
-	typedef Tab8 CLASSNAME;
+	typedef Tab8_Secondary CLASSNAME;
 
 	void Init();
 	void MyFormat(String& s, int i, double d)
@@ -133,9 +133,9 @@ private:
 	Vector<Pointf> s1, s2, s3;
 };
 
-class Tab9 : public WithTab9<ScatterDemo> {
+class Tab9_Big : public WithTab9Big<ScatterDemo> {
 public:
-	typedef Tab9 CLASSNAME;
+	typedef Tab9_Big CLASSNAME;
 	
 	void Init();
 	void OnFastView()		{scatter.SetFastViewX(fastView);};
@@ -146,9 +146,9 @@ private:
 	Vector<Pointf> s1,s2;
 };
 
-class Tab10 : public WithTab10<ScatterDemo> {
+class Tab10_User : public WithTab10User<ScatterDemo> {
 public:
-	typedef Tab10 CLASSNAME;
+	typedef Tab10_User CLASSNAME;
 	
 	void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
@@ -157,11 +157,11 @@ private:
 	double sx[5], sy[5];
 };
 
-class Tab11 : public WithTab11<ScatterDemo> {
+class Tab11_Trend : public WithTab11Trend<ScatterDemo> {
 public:
-	typedef Tab11 CLASSNAME;
+	typedef Tab11_Trend CLASSNAME;
 
-	Tab11() {};	
+	Tab11_Trend() {};	
 	void Init();
 	void OnSeries();
 	virtual ScatterCtrl &Scatter()	{return scatter;};
@@ -177,9 +177,9 @@ private:
 	SinEquation sin;
 };
 
-class Tab12 : public WithTab12<ScatterDemo> {
+class Tab12_Linked : public WithTab12Linked<ScatterDemo> {
 public:
-	typedef Tab12 CLASSNAME;
+	typedef Tab12_Linked CLASSNAME;
 	
 	virtual void Init();
 	virtual ScatterCtrl &Scatter()	{return scatter1;};
diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay
index e8042ee7c..5626038e4 100644
--- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay
+++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay
@@ -10,23 +10,23 @@ LAYOUT(ScatterCtrl_Demo, 624, 352)
 	ITEM(Label, dv___8, SetLabel(t_("Choose example")).LeftPosZ(4, 168).TopPosZ(4, 21))
 END_LAYOUT
 
-LAYOUT(Tab1, 428, 296)
+LAYOUT(Tab1Basic, 428, 296)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Basic Test")).SetPlotAreaRightMargin(20).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).HSizePosZ(4, 4).VSizePosZ(4, 4))
 END_LAYOUT
 
-LAYOUT(Tab2, 380, 292)
+LAYOUT(Tab2Functions, 380, 292)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Functions")).SetGridWidth(2).SetPlotAreaRightMargin(110).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).SetLegendPosX(-107).SetLegendPosY(0).HSizePosZ(16, 12).VSizePosZ(16, 16))
 END_LAYOUT
 
-LAYOUT(Tab3, 384, 284)
+LAYOUT(Tab3ParametricFunctions, 384, 284)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Parametric functions demo")).SetTitleColor(White).SetPlotAreaTopMargin(20).SetPlotAreaColor(Color(229, 229, 229)).SetLabelsColor(White).SetAxisColor(Color(28, 212, 0)).SetAxisWidth(12).SetGridColor(Color(28, 127, 0)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).SetColor(Color(198, 212, 255)).HSizePosZ(16, 16).VSizePosZ(16, 16))
 END_LAYOUT
 
-LAYOUT(Tab4, 400, 316)
+LAYOUT(Tab4Formatting, 400, 316)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Temperature Average. X Axis mouse zoom + scroll")).SetPlotAreaLeftMargin(40).SetPlotAreaTopMargin(20).SetPlotAreaBottomMargin(40).SetLabelX(t_("Month")).SetLabelsFont(SansSerifZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).HSizePosZ(16, 16).VSizePosZ(16, 16))
 END_LAYOUT
 
-LAYOUT(Tab5, 400, 288)
+LAYOUT(Tab5Dynamic, 400, 288)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Dynamic")).SetPlotAreaLeftMargin(40).SetPlotAreaRightMargin(10).SetPlotAreaTopMargin(20).SetPlotAreaBottomMargin(40).SetLabelX(t_("time")).SetLabelY(t_("Electric circuit performance")).SetTitleFont(StdFontZ(14).Bold()).SetLegendAnchor(2).SetLegendPosX(10).SetLegendPosY(10).HSizePosZ(16, 12).VSizePosZ(12, 36))
 	ITEM(Button, bStart, SetLabel(t_("Start")).LeftPosZ(16, 42).BottomPosZ(5, 23))
 	ITEM(Button, bStop, SetLabel(t_("Stop")).LeftPosZ(64, 42).BottomPosZ(5, 23))
@@ -37,11 +37,11 @@ LAYOUT(Tab5, 400, 288)
 	ITEM(Button, bMinus, SetLabel(t_("-")).RightPosZ(14, 30).BottomPosZ(5, 23))
 END_LAYOUT
 
-LAYOUT(Tab6, 400, 280)
+LAYOUT(Tab6Logarithmic, 400, 280)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Logarithmic Scale")).SetPlotAreaTopMargin(20).SetTitleFont(StdFontZ(14).Bold()).SetLegendAnchor(2).HSizePosZ(12, 12).VSizePosZ(16, 16))
 END_LAYOUT
 
-LAYOUT(Tab7, 388, 300)
+LAYOUT(Tab7Operations, 388, 300)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Operations")).SetPlotAreaLeftMargin(45).SetPlotAreaTopMargin(20).SetLabelX(t_("[x]")).SetLabelY(t_("[y]")).SetTitleFont(MonospaceZ(16).Bold()).SetLegendAnchor(2).HSizePosZ(12, 12).VSizePosZ(12, 36))
 	ITEM(Button, bAddSeries, SetLabel(t_("AddSeries")).LeftPosZ(12, 60).BottomPosZ(4, 20))
 	ITEM(Button, bRemoveLastSeries, SetLabel(t_("RemoveLastSeries")).LeftPosZ(76, 104).BottomPosZ(4, 20))
@@ -49,18 +49,18 @@ LAYOUT(Tab7, 388, 300)
 	ITEM(Button, bRemoveAllSeries, SetLabel(t_("RemoveAllSeries")).LeftPosZ(288, 88).BottomPosZ(4, 20))
 END_LAYOUT
 
-LAYOUT(Tab8, 400, 316)
+LAYOUT(Tab8Secondary, 400, 316)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Temperature & Pressure Averages. X-Y Axis mouse zoom + scroll")).SetPlotAreaLeftMargin(40).SetPlotAreaRightMargin(70).SetPlotAreaTopMargin(20).SetPlotAreaBottomMargin(50).SetLabelX(t_("Month")).SetLabelY(t_("Legend Y")).SetLabelY2(t_("Legend Y2")).SetLabelsFont(SansSerifZ(11)).SetTitleFont(SansSerifZ(15).Bold()).SetLegendAnchor(2).HSizePosZ(16, 16).VSizePosZ(16, 16))
 END_LAYOUT
 
-LAYOUT(Tab9, 380, 348)
+LAYOUT(Tab9Big, 380, 348)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Big dataset")).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).HSizePosZ(16, 12).VSizePosZ(16, 76))
 	ITEM(Option, sequentialX, SetLabel(t_("SetSequentialX")).LeftPosZ(112, 92).BottomPosZ(8, 16))
 	ITEM(Option, fastView, SetLabel(t_("SetFastView")).LeftPosZ(16, 84).BottomPosZ(8, 16))
 	ITEM(Label, dv___3, SetLabel(t_("It includes two series with 100000 points.\nTo work with Painter it requires SetFastView and SetSequentialX to be true. \nIf not the program could get stuck.")).HSizePosZ(16, 4).BottomPosZ(28, 44))
 END_LAYOUT
 
-LAYOUT(Tab10, 380, 292)
+LAYOUT(Tab10User, 380, 292)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("User graph")).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(2).HSizePosZ(16, 12).VSizePosZ(16, 16))
 END_LAYOUT
 
@@ -79,7 +79,7 @@ LAYOUT(TabUserEquation, 672, 276)
 	ITEM(Button, update, SetLabel(t_("Update")).RightPosZ(4, 80).BottomPosZ(4, 20))
 END_LAYOUT
 
-LAYOUT(Tab11, 504, 468)
+LAYOUT(Tab11Trend, 504, 468)
 	ITEM(ScatterCtrl, scatter, SetTitle(t_("Trend Line demo")).SetPlotAreaLeftMargin(35).SetPlotAreaTopMargin(20).SetPlotAreaColor(Color(229, 229, 229)).SetAxisWidth(12).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(4).HSizePosZ(8, 8).VSizePosZ(8, 108))
 	ITEM(ArrayCtrl, grid, HSizePosZ(112, 8).BottomPosZ(4, 100))
 	ITEM(Label, dv___2, SetLabel(t_("Data series:")).LeftPosZ(8, 64).BottomPosZ(55, 21))
@@ -87,7 +87,7 @@ LAYOUT(Tab11, 504, 468)
 	ITEM(DropList, seriesList, LeftPosZ(8, 100).BottomPosZ(37, 19))
 END_LAYOUT
 
-LAYOUT(Tab12, 456, 464)
+LAYOUT(Tab12Linked, 456, 464)
 	ITEM(ScatterCtrl, scatter1, SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(1).HSizePosZ(4, 4).TopPosZ(4, 152))
 	ITEM(ScatterCtrl, scatter2, SetPlotAreaTopMargin(0).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(1).HSizePosZ(4, 4).TopPosZ(152, 152))
 	ITEM(ScatterCtrl, scatter3, SetPlotAreaTopMargin(0).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(1).HSizePosZ(4, 4).VSizePosZ(300, 4))
@@ -107,7 +107,7 @@ LAYOUT(TabBubblePlot, 420, 236)
 END_LAYOUT
 
 LAYOUT(TabPie, 536, 440)
-	ITEM(PieCtrl, chart, SetLegendHeight(80).SetLegendBackColor(Color(229, 229, 229)).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12))
+	ITEM(PieCtrl, chart, SetLegendBackColor(Color(229, 229, 229)).SetLegendHeight(80).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12))
 	ITEM(Label, dv___1, SetLabel(t_(" EXPERIMENTAL")).SetFrame(ThinInsetFrame()).LeftPosZ(8, 84).TopPosZ(8, 24))
 END_LAYOUT
 
diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp
index 91c6660a9..5ecabc7e7 100644
--- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp
+++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp
@@ -11,18 +11,18 @@ file
 	ScatterCtrl_Demo.h,
 	ScatterCtrl_Demo.lay,
 	ScatterCtrl_Demo.iml,
-	tab1.cpp,
-	tab2.cpp,
-	tab3.cpp,
-	tab4.cpp,
-	tab5.cpp,
-	tab6.cpp,
-	tab7.cpp,
-	tab8.cpp,
-	tab9.cpp,
-	tab10.cpp,
-	tab11.cpp,
-	tab12.cpp,
+	tab1_Basic.cpp,
+	tab2_Functions.cpp,
+	tab3_ParametricFunctions.cpp,
+	tab4_Formatting.cpp,
+	tab5_Dynamic.cpp,
+	tab6_Logarithmic.cpp,
+	tab7_Operations.cpp,
+	tab8_Secondary.cpp,
+	tab9_Big.cpp,
+	tab10_User.cpp,
+	tab11_Trend.cpp,
+	tab12_Linked.cpp,
 	tab14_UserEquation.cpp,
 	tab15_RangePlot.cpp,
 	tab16_BubblePlot.cpp,
diff --git a/examples/ScatterCtrl_Demo/tab10.cpp b/examples/ScatterCtrl_Demo/tab10_User.cpp
similarity index 95%
rename from examples/ScatterCtrl_Demo/tab10.cpp
rename to examples/ScatterCtrl_Demo/tab10_User.cpp
index 72b8948d3..6881f2cd2 100644
--- a/examples/ScatterCtrl_Demo/tab10.cpp
+++ b/examples/ScatterCtrl_Demo/tab10_User.cpp
@@ -53,7 +53,7 @@ public:
 	}
 };
 
-void Tab10::Init()
+void Tab10_User::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -68,7 +68,7 @@ void Tab10::Init()
 
 ScatterDemo *Construct10()
 {
-	static Tab10 tab;
+	static Tab10_User tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab11.cpp b/examples/ScatterCtrl_Demo/tab11_Trend.cpp
similarity index 95%
rename from examples/ScatterCtrl_Demo/tab11.cpp
rename to examples/ScatterCtrl_Demo/tab11_Trend.cpp
index 2307262ac..8d11ea6b4 100644
--- a/examples/ScatterCtrl_Demo/tab11.cpp
+++ b/examples/ScatterCtrl_Demo/tab11_Trend.cpp
@@ -1,6 +1,6 @@
 #include "ScatterCtrl_Demo.h"
 
-void Tab11::Init()
+void Tab11_Trend::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -18,7 +18,7 @@ void Tab11::Init()
 	OnSeries();
 }
 
-void Tab11::OnSeries() {
+void Tab11_Trend::OnSeries() {
 	double l_r2, p2_r2, p4_r2, f_r2, exp_r2, rat1_r2, s_r2;
 	
 	scatter.RemoveAllSeries();
@@ -96,7 +96,7 @@ void Tab11::OnSeries() {
 
 ScatterDemo *Construct11()
 {
-	static Tab11 tab;
+	static Tab11_Trend tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab12.cpp b/examples/ScatterCtrl_Demo/tab12_Linked.cpp
similarity index 90%
rename from examples/ScatterCtrl_Demo/tab12.cpp
rename to examples/ScatterCtrl_Demo/tab12_Linked.cpp
index 5fc464773..288c8bf1c 100644
--- a/examples/ScatterCtrl_Demo/tab12.cpp
+++ b/examples/ScatterCtrl_Demo/tab12_Linked.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab12::Init()
+void Tab12_Linked::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -28,7 +28,7 @@ void Tab12::Init()
 	link.WhenAction = THISBACK(OnLink);
 }
 
-void Tab12::OnLink() {
+void Tab12_Linked::OnLink() {
 	if (link) {
 		scatter1.SetTitle("Plots are linked together");
 		scatter2.LinkedWith(scatter1);
@@ -42,7 +42,7 @@ void Tab12::OnLink() {
 
 ScatterDemo *Construct12()
 {
-	static Tab12 tab;
+	static Tab12_Linked tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab1.cpp b/examples/ScatterCtrl_Demo/tab1_Basic.cpp
similarity index 93%
rename from examples/ScatterCtrl_Demo/tab1.cpp
rename to examples/ScatterCtrl_Demo/tab1_Basic.cpp
index ce15e523d..5529a3727 100644
--- a/examples/ScatterCtrl_Demo/tab1.cpp
+++ b/examples/ScatterCtrl_Demo/tab1_Basic.cpp
@@ -4,7 +4,7 @@ enum {
 	SERIE2
 };
 
-void Tab1::Init()
+void Tab1_Basic::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -39,7 +39,7 @@ void Tab1::Init()
 
 ScatterDemo *Construct1()
 {
-	static Tab1 tab;
+	static Tab1_Basic tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab2.cpp b/examples/ScatterCtrl_Demo/tab2_Functions.cpp
similarity index 90%
rename from examples/ScatterCtrl_Demo/tab2.cpp
rename to examples/ScatterCtrl_Demo/tab2_Functions.cpp
index a933da734..cdce40a64 100644
--- a/examples/ScatterCtrl_Demo/tab2.cpp
+++ b/examples/ScatterCtrl_Demo/tab2_Functions.cpp
@@ -9,7 +9,7 @@ void   vfunct1(double& y, double x) {y = 0;}
 void   vfunct2(double& y, double x) {y = x*x;}
 void   vfunct3(double& y, double x) {y = -x*x;}
 
-void Tab2::Init()
+void Tab2_Functiona::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -28,7 +28,7 @@ void Tab2::Init()
 
 ScatterDemo *Construct2()
 {
-	static Tab2 tab;
+	static Tab2_Functiona tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab3.cpp b/examples/ScatterCtrl_Demo/tab3_ParametricFunctions.cpp
similarity index 93%
rename from examples/ScatterCtrl_Demo/tab3.cpp
rename to examples/ScatterCtrl_Demo/tab3_ParametricFunctions.cpp
index c2bfebee5..1ce51ca78 100644
--- a/examples/ScatterCtrl_Demo/tab3.cpp
+++ b/examples/ScatterCtrl_Demo/tab3_ParametricFunctions.cpp
@@ -12,7 +12,7 @@ void para5(Pointf& xy, double t) {xy = Pointf(-0.25+0.5*t, 0);}
 void para1p(Pointf& xy, double t, double a, double b) 	{xy = Pointf(a*cos(2*M_PI*t),b*sin(2*M_PI*t));}
 void para3p(Pointf& xy, double t, double a) 			{xy = Pointf(a+(0.5+t)*cos(6*M_PI*t),(0.5+t)*sin(6*M_PI*t));}
 
-void Tab3::Init()
+void Tab3_ParametricFunctions::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -34,7 +34,7 @@ void Tab3::Init()
 
 ScatterDemo *Construct3()
 {
-	static Tab3 tab;
+	static Tab3_ParametricFunctions tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab4.cpp b/examples/ScatterCtrl_Demo/tab4_Formatting.cpp
similarity index 91%
rename from examples/ScatterCtrl_Demo/tab4.cpp
rename to examples/ScatterCtrl_Demo/tab4_Formatting.cpp
index 770b3c7e9..367946086 100644
--- a/examples/ScatterCtrl_Demo/tab4.cpp
+++ b/examples/ScatterCtrl_Demo/tab4_Formatting.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab4::Init()
+void Tab4_Formatting::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -25,7 +25,7 @@ void Tab4::Init()
 
 ScatterDemo *Construct4()
 {
-	static Tab4 tab;
+	static Tab4_Formatting tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab5.cpp b/examples/ScatterCtrl_Demo/tab5_Dynamic.cpp
similarity index 78%
rename from examples/ScatterCtrl_Demo/tab5.cpp
rename to examples/ScatterCtrl_Demo/tab5_Dynamic.cpp
index 9cc45282a..3ccc63029 100644
--- a/examples/ScatterCtrl_Demo/tab5.cpp
+++ b/examples/ScatterCtrl_Demo/tab5_Dynamic.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab5::Init()
+void Tab5_Dynamic::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -20,7 +20,7 @@ void Tab5::Init()
 	bStop.Disable();	
 }
 
-void Tab5::Animate()
+void Tab5_Dynamic::Animate()
 {
 	s1 << Pointf(t, 50+20*sin(t));
 	s2 << Pointf(t, 50+30*cos(t));
@@ -30,21 +30,21 @@ void Tab5::Animate()
 		scatter.SetXYMin(scatter.GetXMin() + 0.1, 0);
 }
 
-void Tab5::Start()
+void Tab5_Dynamic::Start()
 {
 	SetTimeCallback(-5, THISBACK(Animate));
 	bStart.Disable();
 	bStop.Enable();
 }
 
-void Tab5::Stop()
+void Tab5_Dynamic::Stop()
 {
 	KillTimeCallback();
 	bStart.Enable();
 	bStop.Disable();
 }
 
-void Tab5::Reset()
+void Tab5_Dynamic::Reset()
 {
 	t = 0;
 	s1.Clear();
@@ -53,25 +53,25 @@ void Tab5::Reset()
 	scatter.Refresh();
 }
 
-void Tab5::PgDown()
+void Tab5_Dynamic::PgDown()
 {
 	scatter.SetXYMin(scatter.GetXMin()-5, 0);
 	scatter.Refresh();
 }
 
-void Tab5::PgUp()
+void Tab5_Dynamic::PgUp()
 {
 	scatter.SetXYMin(scatter.GetXMin()+5, 0);
 	scatter.Refresh();
 }
 
-void Tab5::Plus()
+void Tab5_Dynamic::Plus()
 {
 	scatter.SetRange(scatter.GetXRange()/2, 100);
 	scatter.Refresh();
 }
 
-void Tab5::Minus()
+void Tab5_Dynamic::Minus()
 {
 	scatter.SetRange(scatter.GetXRange()*2, 100);
 	scatter.Refresh();
@@ -79,7 +79,7 @@ void Tab5::Minus()
 
 ScatterDemo *Construct5()
 {
-	static Tab5 tab;
+	static Tab5_Dynamic tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab6.cpp b/examples/ScatterCtrl_Demo/tab6_Logarithmic.cpp
similarity index 77%
rename from examples/ScatterCtrl_Demo/tab6.cpp
rename to examples/ScatterCtrl_Demo/tab6_Logarithmic.cpp
index d49d0fb4b..33d662a4a 100644
--- a/examples/ScatterCtrl_Demo/tab6.cpp
+++ b/examples/ScatterCtrl_Demo/tab6_Logarithmic.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab6::Init()
+void Tab6_Logarithmic::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -15,14 +15,14 @@ void Tab6::Init()
 	scatter.cbModifFormatX = THISBACK(FormatX);
 }
 
-void Tab6::FormatX(String& s, int i, double d)
+void Tab6_Logarithmic::FormatX(String& s, int i, double d)
 {
 	s = FormatDoubleExp(pow(10., d), 1);
 }
 
 ScatterDemo *Construct6()
 {
-	static Tab6 tab;
+	static Tab6_Logarithmic tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab7.cpp b/examples/ScatterCtrl_Demo/tab7_Operations.cpp
similarity index 77%
rename from examples/ScatterCtrl_Demo/tab7.cpp
rename to examples/ScatterCtrl_Demo/tab7_Operations.cpp
index c1b207444..20af72d4d 100644
--- a/examples/ScatterCtrl_Demo/tab7.cpp
+++ b/examples/ScatterCtrl_Demo/tab7_Operations.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab7::Init()
+void Tab7_Operations::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -14,7 +14,7 @@ void Tab7::Init()
 	bRemoveAllSeries 	<<= THISBACK(RemoveAllSeries);
 }
 
-void Tab7::AddSeries()
+void Tab7_Operations::AddSeries()
 {
 	int num = scatter.GetCount();
 	double f = 1 + num*1.1;	
@@ -24,7 +24,7 @@ void Tab7::AddSeries()
 	scatter.AddSeries(s).Legend(String("series") + AsString(num));	
 } 
 
-void Tab7::RemoveFirstSeries()	
+void Tab7_Operations::RemoveFirstSeries()	
 {
 	if (scatter.IsEmpty())
 		return;
@@ -32,7 +32,7 @@ void Tab7::RemoveFirstSeries()
 	series.Remove(0);
 }
 
-void Tab7::RemoveLastSeries()		
+void Tab7_Operations::RemoveLastSeries()		
 {
 	if (scatter.IsEmpty())
 		return;
@@ -41,7 +41,7 @@ void Tab7::RemoveLastSeries()
 	series.Remove(topIndex);
 }
 
-void Tab7::RemoveAllSeries()		
+void Tab7_Operations::RemoveAllSeries()		
 {
 	scatter.RemoveAllSeries();
 	series.Clear();
@@ -49,7 +49,7 @@ void Tab7::RemoveAllSeries()
 
 ScatterDemo *Construct7()
 {
-	static Tab7 tab;
+	static Tab7_Operations tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab8.cpp b/examples/ScatterCtrl_Demo/tab8_Secondary.cpp
similarity index 94%
rename from examples/ScatterCtrl_Demo/tab8.cpp
rename to examples/ScatterCtrl_Demo/tab8_Secondary.cpp
index f03efe158..4679efd55 100644
--- a/examples/ScatterCtrl_Demo/tab8.cpp
+++ b/examples/ScatterCtrl_Demo/tab8_Secondary.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab8::Init()
+void Tab8_Secondary::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -32,7 +32,7 @@ void Tab8::Init()
 
 ScatterDemo *Construct8()
 {
-	static Tab8 tab;
+	static Tab8_Secondary tab;
 	return &tab;
 }
 
diff --git a/examples/ScatterCtrl_Demo/tab9.cpp b/examples/ScatterCtrl_Demo/tab9_Big.cpp
similarity index 90%
rename from examples/ScatterCtrl_Demo/tab9.cpp
rename to examples/ScatterCtrl_Demo/tab9_Big.cpp
index 989d39f1d..90dd2179e 100644
--- a/examples/ScatterCtrl_Demo/tab9.cpp
+++ b/examples/ScatterCtrl_Demo/tab9_Big.cpp
@@ -1,7 +1,7 @@
 #include "ScatterCtrl_Demo.h"
 
 
-void Tab9::Init()
+void Tab9_Big::Init()
 {
 	CtrlLayout(*this);	
 	SizePos();
@@ -25,7 +25,7 @@ void Tab9::Init()
 
 ScatterDemo *Construct9()
 {
-	static Tab9 tab;
+	static Tab9_Big tab;
 	return &tab;
 }