5 files changed, 19 insertions, 19 deletions

diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 349b51f1ca..31aeac6716 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -368,15 +368,15 @@ void Lingo::c_goto() {
 }
 
 void Lingo::c_gotoloop() {
-	g_lingo->func_gotoLoop();
+	g_lingo->func_gotoloop();
 }
 
 void Lingo::c_gotonext() {
-	g_lingo->func_gotoNext();
+	g_lingo->func_gotonext();
 }
 
 void Lingo::c_gotoprevious() {
-	g_lingo->func_gotoPrev();
+	g_lingo->func_gotoprevious();
 }
 
 void Lingo::c_call() {
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index eae253db89..fbb65ea1a0 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -208,16 +208,16 @@ void Lingo::func_goto(Common::String &frame, Common::String &movie) {
 	_vm->_currentScore->setCurrentFrame(strtol(frame.c_str(), 0, 10));
 }
 
-void Lingo::func_gotoLoop() {
-	_vm->_currentScore->goToLoop();
+void Lingo::func_gotoloop() {
+	_vm->_currentScore->gotoloop();
 }
 
-void Lingo::func_gotoNext() {
-	_vm->_currentScore->goToNext();
+void Lingo::func_gotonext() {
+	_vm->_currentScore->gotonext();
 }
 
-void Lingo::func_gotoPrev() {
-	_vm->_currentScore->goToPrevious();
+void Lingo::func_gotoprevious() {
+	_vm->_currentScore->gotoprevious();
 }
 
 }
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 137b8f7c5b..93a2e23267 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -178,9 +178,9 @@ public:
 	void func_mci(Common::String &s);
 	void func_mciwait(Common::String &s);
 	void func_goto(Common::String &frame, Common::String &movie);
-	void func_gotoLoop();
-	void func_gotoNext();
-	void func_gotoPrev();
+	void func_gotoloop();
+	void func_gotonext();
+	void func_gotoprevious();
 
 public:
 	ScriptData *_currentScript;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 7b26a952e2..ff324c59c4 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -408,7 +408,7 @@ void Score::loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id)
 	_castsInfo[id] = ci;
 }
 
-void Score::goToLoop() {
+void Score::gotoloop() {
 	//This command has the playback head contonuously return to the first marker to to the left and then loop back.
 	//If no marker are to the left of the playback head, the playback head continues to the right.
 	Common::SortedArray<Label *>::iterator i;
@@ -421,7 +421,7 @@ void Score::goToLoop() {
 	}
 }
 
-void Score::goToNext() {
+void Score::gotonext() {
 	Common::SortedArray<Label *>::iterator i;
 
 	for (i = _labels->begin(); i != _labels->end(); ++i) {
@@ -444,7 +444,7 @@ void Score::goToNext() {
 	_currentFrame = 0;
 }
 
-void Score::goToPrevious() {
+void Score::gotoprevious() {
 	//One label
 	if (_labels->begin() == _labels->end()) {
 		_currentFrame = (*_labels->begin())->number;
diff --git a/engines/director/score.h b/engines/director/score.h
index 0327425fd9..6c6b661d69 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -330,7 +330,7 @@ public:
 struct Label {
 	Common::String name;
 	uint16 number;
-	Label(Common::String _name, uint16 _number) { name = _name; number = _number; }
+	Label(Common::String name1, uint16 number1) { name = name1; number = number1; }
 };
 
 class Score {
@@ -342,9 +342,9 @@ public:
 	static int compareLabels(const void *a, const void *b);
 	void loadArchive();
 	void setStartToLabel(Common::String label);
-	void goToLoop();
-	void goToNext();
-	void goToPrevious();
+	void gotoloop();
+	void gotonext();
+	void gotoprevious();
 	void startLoop();
 	void processEvents();
 	Archive *getArchive() const { return _movieArchive; };