diff --git a/obp60v.conf-sample b/obp60v.conf-sample
index ac4df85..d5022a9 100644
--- a/obp60v.conf-sample
+++ b/obp60v.conf-sample
@@ -102,10 +102,10 @@ type = Barograph
 type = Anchor
 
 [page4]
-type = Autobahn
+type = XTETrack
 
 [page5]
-type = ApparentWind
+type = Wind
 
 [page6]
 type = TwoValues
diff --git a/pages/__init__.py b/pages/__init__.py
index 2a488fe..422f104 100644
--- a/pages/__init__.py
+++ b/pages/__init__.py
@@ -22,8 +22,6 @@ from .fluid import Fluid
 # Spezialseiten
 from .ais import AIS
 from .anchor import Anchor
-from .apparentwind import ApparentWind
-from .autobahn import Autobahn
 from .autopilot import Autopilot
 from .barograph import Barograph
 from .battery import Battery
@@ -40,4 +38,6 @@ from .solar import Solar
 from .tracker import Tracker
 from .rudder import Rudder
 from .voltage import Voltage
+from .wind import Wind
 from .windrose import WindRose
+from .xtetrack import XTETrack
diff --git a/pages/apparentwind.py b/pages/wind.py
similarity index 98%
rename from pages/apparentwind.py
rename to pages/wind.py
index d45e0ea..d8d4ab3 100644
--- a/pages/apparentwind.py
+++ b/pages/wind.py
@@ -3,7 +3,7 @@ import cairo
 import math
 from .page import Page
 
-class ApparentWind(Page):
+class Wind(Page):
 
     def __init__(self, pageno, cfg, appdata, boatdata):
         super().__init__(pageno, cfg, appdata, boatdata)
diff --git a/pages/autobahn.py b/pages/xtetrack.py
similarity index 99%
rename from pages/autobahn.py
rename to pages/xtetrack.py
index e1c62ae..5f78a3f 100644
--- a/pages/autobahn.py
+++ b/pages/xtetrack.py
@@ -9,7 +9,7 @@ import cairo
 import math
 from .page import Page
 
-class Autobahn(Page):
+class XTETrack(Page):
 
     def __init__(self, pageno, cfg, appdata, boatdata):
         super().__init__(pageno, cfg, appdata, boatdata)