diff --git a/engines/bladerunner/aud_decoder.cpp b/engines/bladerunner/aud_decoder.cpp
index d11a90e196a1..3123ddddb710 100644
--- a/engines/bladerunner/aud_decoder.cpp
+++ b/engines/bladerunner/aud_decoder.cpp
@@ -164,4 +164,4 @@ void ADPCMWestwoodDecoder::decode(uint8 *in, size_t size, int16 *out)
 	_predictor = predictor;
 }
 
-};
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index bf95ca7922d2..836450fd7032 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -86,6 +86,6 @@ class BladeRunnerEngine : public Engine {
 	Common::SeekableReadStream *getResourceStream(const Common::String &name);
 };
 
-} // End of namespace Blade Runner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/chapters.h b/engines/bladerunner/chapters.h
index 9fae487b0099..f167e1b06862 100644
--- a/engines/bladerunner/chapters.h
+++ b/engines/bladerunner/chapters.h
@@ -57,6 +57,6 @@ class Chapters {
 	int  currentResouceId() { return _chapter ? _resourceIds[_chapter] : -1; }
 };
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/decompress_lcw.cpp b/engines/bladerunner/decompress_lcw.cpp
index e632ec77145e..15e28bf3af30 100644
--- a/engines/bladerunner/decompress_lcw.cpp
+++ b/engines/bladerunner/decompress_lcw.cpp
@@ -159,4 +159,4 @@ uint32 decompress_lcw_output_size(uint8 *inBuf, uint32 inLen) {
 	return outsize;
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/decompress_lcw.h b/engines/bladerunner/decompress_lcw.h
index ea09aabf5b6b..dbb0e04939ce 100644
--- a/engines/bladerunner/decompress_lcw.h
+++ b/engines/bladerunner/decompress_lcw.h
@@ -30,6 +30,6 @@ namespace BladeRunner {
 uint32 decompress_lcw(uint8 *inBuf, uint32 inLen, uint8 *outBuf, uint32 outLen);
 uint32 decompress_lcw_output_size(void *inBuf, uint32 inLen);
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/decompress_lzo.cpp b/engines/bladerunner/decompress_lzo.cpp
index 147d11d56ea6..aa4ebc74dd17 100644
--- a/engines/bladerunner/decompress_lzo.cpp
+++ b/engines/bladerunner/decompress_lzo.cpp
@@ -140,4 +140,4 @@ int decompress_lzo1x(const uint8 *in, size_t inLen, uint8 *out, size_t *outLen)
 	return ip != ip_end;
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/decompress_lzo.h b/engines/bladerunner/decompress_lzo.h
index 20e8581f6117..e6404c654c73 100644
--- a/engines/bladerunner/decompress_lzo.h
+++ b/engines/bladerunner/decompress_lzo.h
@@ -29,6 +29,6 @@ namespace BladeRunner {
 
 int decompress_lzo1x(const uint8 *in, size_t inLen, uint8 *out, size_t *outLen);
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/gameinfo.cpp b/engines/bladerunner/gameinfo.cpp
index 66a7af8263a8..2d5879d9c2a2 100644
--- a/engines/bladerunner/gameinfo.cpp
+++ b/engines/bladerunner/gameinfo.cpp
@@ -109,4 +109,4 @@ bool GameInfo::open(const Common::String &name) {
 	return !s->err();
 }
 
-} // End of namespace Blade Runner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/gameinfo.h b/engines/bladerunner/gameinfo.h
index 64153beb3547..094d15794958 100644
--- a/engines/bladerunner/gameinfo.h
+++ b/engines/bladerunner/gameinfo.h
@@ -77,6 +77,6 @@ class GameInfo {
 	char *getOuttake(int i)        { return _outtakes[i]; }
 };
 
-} // End of namespace Blade Runner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/image.cpp b/engines/bladerunner/image.cpp
index fc6b68fd5ac7..42070bc84a07 100644
--- a/engines/bladerunner/image.cpp
+++ b/engines/bladerunner/image.cpp
@@ -75,4 +75,4 @@ void Image::copyToSurface(Graphics::Surface *dst) const {
 	dst->copyRectToSurface(_surface, 0, 0, Common::Rect(_surface.w, _surface.h));
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/image.h b/engines/bladerunner/image.h
index 5d2fa69ea022..3980ff4c3c2b 100644
--- a/engines/bladerunner/image.h
+++ b/engines/bladerunner/image.h
@@ -42,6 +42,6 @@ class Image {
 	void copyToSurface(Graphics::Surface *surface) const;
 };
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index 3bbcb6b7293b..092dc51ebe75 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -70,4 +70,4 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 	}
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/outtake.h b/engines/bladerunner/outtake.h
index 9182b878c070..7ef3552edea6 100644
--- a/engines/bladerunner/outtake.h
+++ b/engines/bladerunner/outtake.h
@@ -49,6 +49,6 @@ class OuttakePlayer {
 	void play(const Common::String &name, bool noLocalization, int container);
 };
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/settings.cpp b/engines/bladerunner/settings.cpp
index 8e46b5d9f259..c31d4a37db76 100644
--- a/engines/bladerunner/settings.cpp
+++ b/engines/bladerunner/settings.cpp
@@ -96,4 +96,4 @@ bool Settings::openNewScene() {
 	return true;
 }
 
-} // End of namespace Blade Runner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/settings.h b/engines/bladerunner/settings.h
index cb35285e045d..61ac42039d7b 100644
--- a/engines/bladerunner/settings.h
+++ b/engines/bladerunner/settings.h
@@ -89,6 +89,6 @@ class Settings {
 	bool openNewScene();
 };
 
-} // End of namespace Blade Runner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index bcba7d06b83e..d97c1d8c46ab 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -934,4 +934,4 @@ bool VQADecoder::VQAAudioTrack::readSN2J(Common::SeekableReadStream *s, uint32 s
 	return true;
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/vqa_decoder.h b/engines/bladerunner/vqa_decoder.h
index 13097c6f11cc..f5b00f5c3359 100644
--- a/engines/bladerunner/vqa_decoder.h
+++ b/engines/bladerunner/vqa_decoder.h
@@ -215,6 +215,6 @@ class VQADecoder
 	};
 };
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/vqa_player.cpp b/engines/bladerunner/vqa_player.cpp
index 4c8307973013..ad269efc751b 100644
--- a/engines/bladerunner/vqa_player.cpp
+++ b/engines/bladerunner/vqa_player.cpp
@@ -129,4 +129,4 @@ void VQAPlayer::queueAudioFrame(Audio::AudioStream *audioStream) {
 	_audioStream->queueAudioStream(audioStream, DisposeAfterUse::YES);
 }
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/vqa_player.h b/engines/bladerunner/vqa_player.h
index e38a2748bde2..128bbe604dea 100644
--- a/engines/bladerunner/vqa_player.h
+++ b/engines/bladerunner/vqa_player.h
@@ -85,6 +85,6 @@ class VQAPlayer {
 	void queueAudioFrame(Audio::AudioStream *audioStream);
 };
 
-}; // End of namespace BladeRunner
+} // End of namespace BladeRunner
 
 #endif