25 files changed, 89 insertions, 89 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci.cpp
index 1008a60157..3b633c1dfa 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci.cpp
@@ -29,16 +29,16 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/acci2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/scrolls2.h"
+#include "avalanche/acci.h"
+#include "avalanche/gyro.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/scrolls.h"
 #include "avalanche/timer.h"
 #include "avalanche/animation.h"
-#include "avalanche/enid2.h"
-#include "avalanche/celer2.h"
-#include "avalanche/pingo2.h"
-#include "avalanche/sequence2.h"
+#include "avalanche/enid.h"
+#include "avalanche/celer.h"
+#include "avalanche/pingo.h"
+#include "avalanche/sequence.h"
 
 #include "common/textconsole.h"
 
diff --git a/engines/avalanche/acci2.h b/engines/avalanche/acci.h
index 07816cc772..07816cc772 100644
--- a/engines/avalanche/acci2.h
+++ b/engines/avalanche/acci.h
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 21063e09a7..526f6a8517 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -30,13 +30,13 @@
 #include "avalanche/avalanche.h"
 
 #include "avalanche/animation.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/celer2.h"
-#include "avalanche/sequence2.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/gyro.h"
+#include "avalanche/celer.h"
+#include "avalanche/sequence.h"
 #include "avalanche/timer.h"
-#include "avalanche/enid2.h"
+#include "avalanche/enid.h"
 
 #include "common/scummsys.h"
 #include "common/textconsole.h"
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index b93c117377..30eaee03fd 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -34,18 +34,18 @@
 #include "avalanche/parser.h"
 
 #include "avalanche/avalot.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/pingo2.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/enid2.h"
-#include "avalanche/celer2.h"
-#include "avalanche/sequence2.h"
+#include "avalanche/gyro.h"
+#include "avalanche/pingo.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/enid.h"
+#include "avalanche/celer.h"
+#include "avalanche/sequence.h"
 #include "avalanche/timer.h"
 #include "avalanche/animation.h"
-#include "avalanche/acci2.h"
-#include "avalanche/dropdown2.h"
-#include "avalanche/closing2.h"
+#include "avalanche/acci.h"
+#include "avalanche/dropdown.h"
+#include "avalanche/closing.h"
 
 #include "common/serializer.h"
 
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index a5b3e06ff8..a52186d4e2 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -31,17 +31,17 @@
 
 #include "avalanche/graphics.h"
 #include "avalanche/avalot.h"
-#include "avalanche/gyro2.h"
+#include "avalanche/gyro.h"
 #include "avalanche/animation.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/dropdown2.h"
-#include "avalanche/pingo2.h"
+#include "avalanche/gyro.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/dropdown.h"
+#include "avalanche/pingo.h"
 #include "avalanche/timer.h"
-#include "avalanche/celer2.h"
-#include "avalanche/enid2.h"
-#include "avalanche/closing2.h"
+#include "avalanche/celer.h"
+#include "avalanche/enid.h"
+#include "avalanche/closing.h"
 
 #include "common/str.h"
 #include "common/textconsole.h"
diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer.cpp
index 7e2891e691..f8b2604ee0 100644
--- a/engines/avalanche/celer2.cpp
+++ b/engines/avalanche/celer.cpp
@@ -29,10 +29,10 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/celer2.h"
+#include "avalanche/celer.h"
 #include "avalanche/animation.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/gyro2.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/gyro.h"
 #include "avalanche/roomnums.h"
 
 #include "common/textconsole.h"
diff --git a/engines/avalanche/celer2.h b/engines/avalanche/celer.h
index 47a11bfad4..47a11bfad4 100644
--- a/engines/avalanche/celer2.h
+++ b/engines/avalanche/celer.h
diff --git a/engines/avalanche/closing2.cpp b/engines/avalanche/closing.cpp
index 7da630bae3..df53bc38b9 100644
--- a/engines/avalanche/closing2.cpp
+++ b/engines/avalanche/closing.cpp
@@ -29,9 +29,9 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/closing2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/lucerna2.h"
+#include "avalanche/closing.h"
+#include "avalanche/gyro.h"
+#include "avalanche/lucerna.h"
 
 #include "common/textconsole.h"
 #include "common/random.h"
diff --git a/engines/avalanche/closing2.h b/engines/avalanche/closing.h
index a2543fd3af..a2543fd3af 100644
--- a/engines/avalanche/closing2.h
+++ b/engines/avalanche/closing.h
diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown.cpp
index 1f499a22af..2e070e6b0b 100644
--- a/engines/avalanche/dropdown2.cpp
+++ b/engines/avalanche/dropdown.cpp
@@ -29,12 +29,12 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/dropdown2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/acci2.h"
+#include "avalanche/dropdown.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/gyro.h"
+#include "avalanche/acci.h"
 #include "avalanche/animation.h"
-#include "avalanche/enid2.h"
+#include "avalanche/enid.h"
 
 #include "common/textconsole.h"
 
diff --git a/engines/avalanche/dropdown2.h b/engines/avalanche/dropdown.h
index 95e258effb..95e258effb 100644
--- a/engines/avalanche/dropdown2.h
+++ b/engines/avalanche/dropdown.h
diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid.cpp
index 4c8013e879..4e8071a109 100644
--- a/engines/avalanche/enid2.cpp
+++ b/engines/avalanche/enid.cpp
@@ -29,13 +29,13 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/enid2.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/lucerna2.h"
+#include "avalanche/enid.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/lucerna.h"
 #include "avalanche/animation.h"
 #include "avalanche/timer.h"
-#include "avalanche/celer2.h"
-#include "avalanche/sequence2.h"
+#include "avalanche/celer.h"
+#include "avalanche/sequence.h"
 
 #include "common/textconsole.h"
 
diff --git a/engines/avalanche/enid2.h b/engines/avalanche/enid.h
index 97e249e187..97e249e187 100644
--- a/engines/avalanche/enid2.h
+++ b/engines/avalanche/enid.h
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro.cpp
index 7598d6c331..1e95c6b725 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro.cpp
@@ -29,11 +29,11 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/gyro2.h"
-#include "avalanche/pingo2.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/lucerna2.h"
-#include "avalanche/acci2.h"
+#include "avalanche/gyro.h"
+#include "avalanche/pingo.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/acci.h"
 #include "avalanche/animation.h"
 
 #include "common/file.h"
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro.h
index 0f8b9aea5d..0f8b9aea5d 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro.h
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna.cpp
index c45c85c61b..31a8874341 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -29,16 +29,16 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/lucerna2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/scrolls2.h"
+#include "avalanche/lucerna.h"
+#include "avalanche/gyro.h"
+#include "avalanche/scrolls.h"
 #include "avalanche/timer.h"
 #include "avalanche/animation.h"
-#include "avalanche/enid2.h"
-#include "avalanche/celer2.h"
-#include "avalanche/pingo2.h"
-#include "avalanche/sequence2.h"
-#include "avalanche/acci2.h"
+#include "avalanche/enid.h"
+#include "avalanche/celer.h"
+#include "avalanche/pingo.h"
+#include "avalanche/sequence.h"
+#include "avalanche/acci.h"
 #include "avalanche/roomnums.h"
 
 #include "common/rect.h"
diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna.h
index 9c1cc6ce44..9c1cc6ce44 100644
--- a/engines/avalanche/lucerna2.h
+++ b/engines/avalanche/lucerna.h
diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk
index 6881a3e216..aabf34c4af 100644
--- a/engines/avalanche/module.mk
+++ b/engines/avalanche/module.mk
@@ -7,18 +7,18 @@ MODULE_OBJS = \
 	avalot.o \
 	console.o \
 	detection.o \
-	gyro2.o \
-	pingo2.o \
-	scrolls2.o \
-	lucerna2.o \
-	enid2.o \
-	celer2.o \
-	sequence2.o \
+	gyro.o \
+	pingo.o \
+	scrolls.o \
+	lucerna.o \
+	enid.o \
+	celer.o \
+	sequence.o \
 	timer.o \
 	animation.o \
-	acci2.o \
-	dropdown2.o \
-	closing2.o
+	acci.o \
+	dropdown.o \
+	closing.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_AVALANCHE), DYNAMIC_PLUGIN)
diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo.cpp
index 9f99d8c184..5f2df1bc11 100644
--- a/engines/avalanche/pingo2.cpp
+++ b/engines/avalanche/pingo.cpp
@@ -29,11 +29,11 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/pingo2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/lucerna2.h"
+#include "avalanche/pingo.h"
+#include "avalanche/gyro.h"
+#include "avalanche/lucerna.h"
 #include "avalanche/animation.h"
-#include "avalanche/scrolls2.h"
+#include "avalanche/scrolls.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
diff --git a/engines/avalanche/pingo2.h b/engines/avalanche/pingo.h
index ee4fb587e7..ee4fb587e7 100644
--- a/engines/avalanche/pingo2.h
+++ b/engines/avalanche/pingo.h
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls.cpp
index 56e9b2f1c4..6e1bb0b492 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -29,11 +29,11 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/scrolls2.h"
-#include "avalanche/gyro2.h"
-#include "avalanche/lucerna2.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/gyro.h"
+#include "avalanche/lucerna.h"
 #include "avalanche/animation.h"
-#include "avalanche/acci2.h"
+#include "avalanche/acci.h"
 #include "avalanche/timer.h"
 
 #include "common/textconsole.h"
diff --git a/engines/avalanche/scrolls2.h b/engines/avalanche/scrolls.h
index a8938a5d34..a8938a5d34 100644
--- a/engines/avalanche/scrolls2.h
+++ b/engines/avalanche/scrolls.h
diff --git a/engines/avalanche/sequence2.cpp b/engines/avalanche/sequence.cpp
index 22ee7fc0e4..0e6d72acdd 100644
--- a/engines/avalanche/sequence2.cpp
+++ b/engines/avalanche/sequence.cpp
@@ -29,10 +29,10 @@
 
 #include "avalanche/avalanche.h"
 
-#include "avalanche/sequence2.h"
-#include "avalanche/gyro2.h"
+#include "avalanche/sequence.h"
+#include "avalanche/gyro.h"
 #include "avalanche/timer.h"
-#include "avalanche/celer2.h"
+#include "avalanche/celer.h"
 #include "avalanche/animation.h"
 
 #include "common/scummsys.h"
diff --git a/engines/avalanche/sequence2.h b/engines/avalanche/sequence.h
index 67650d519d..67650d519d 100644
--- a/engines/avalanche/sequence2.h
+++ b/engines/avalanche/sequence.h
diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp
index 4e3f3aa2a9..736a5812ce 100644
--- a/engines/avalanche/timer.cpp
+++ b/engines/avalanche/timer.cpp
@@ -30,13 +30,13 @@
 #include "avalanche/avalanche.h"
 
 #include "avalanche/timer.h"
-#include "avalanche/lucerna2.h"
+#include "avalanche/lucerna.h"
 #include "avalanche/animation.h"
-#include "avalanche/scrolls2.h"
-#include "avalanche/acci2.h"
-#include "avalanche/sequence2.h"
-#include "avalanche/enid2.h"
-#include "avalanche/pingo2.h"
+#include "avalanche/scrolls.h"
+#include "avalanche/acci.h"
+#include "avalanche/sequence.h"
+#include "avalanche/enid.h"
+#include "avalanche/pingo.h"
 
 #include "common/textconsole.h"