diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h
index f678ddcdd..1d01938c7 100644
--- a/3rdParty/Storm/Source/storm.h
+++ b/3rdParty/Storm/Source/storm.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <limits>
 #include <string>
-namespace dvl {
+namespace devilution {
 
 typedef struct PCXHeader {
 	Uint8 Manufacturer;
diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h
index 422b7954a..3de95e779 100644
--- a/DiabloUI/diabloui.h
+++ b/DiabloUI/diabloui.h
@@ -2,7 +2,7 @@
 #ifndef __DIABLOUI_H__
 #define __DIABLOUI_H__
 
-namespace dvl {
+namespace devilution {
 
 typedef struct _uidefaultstats {
 	Uint16 strength;
diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 03d96212f..dfa74a265 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -7,7 +7,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 #include <config.h>
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -49,7 +49,7 @@ void FreeDlg()
 	SNetDestroy();
 }
 
-}
+} // namespace
 
 /**
  * @brief Terminates the game and displays an error message box.
@@ -173,4 +173,4 @@ void DirErrorDlg(const char *error)
 	app_fatal(NULL);
 }
 
-}
+} // namespace devilution
diff --git a/Source/appfat.h b/Source/appfat.h
index 9ebbafa28..9db346ede 100644
--- a/Source/appfat.h
+++ b/Source/appfat.h
@@ -7,7 +7,7 @@
 
 #include <SDL.h>
 
-namespace dvl {
+namespace devilution {
 
 [[noreturn]] void app_fatal(const char *pszFmt, ...);
 void DrawDlg(const char *pszFmt, ...);
diff --git a/Source/automap.cpp b/Source/automap.cpp
index 995c6af03..6d005cc3b 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 /**
@@ -453,7 +453,7 @@ void DrawAutomapText(CelOutputBuffer out)
 	}
 }
 
-}
+} // namespace
 
 bool automapflag;
 bool automapview[DMAXX][DMAXY];
@@ -764,4 +764,4 @@ void AutomapZoomReset()
 	AmLine4 = AmLine8 >> 1;
 }
 
-}
+} // namespace devilution
diff --git a/Source/automap.h b/Source/automap.h
index 1b5f13216..9a90f7e96 100644
--- a/Source/automap.h
+++ b/Source/automap.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/capture.cpp b/Source/capture.cpp
index 47bb5e49a..385b51f0f 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -10,7 +10,7 @@
 #include "paths.h"
 #include "file_util.h"
 
-namespace dvl {
+namespace devilution {
 
 /**
  * @brief Write the PCX-file header
@@ -205,4 +205,4 @@ void CaptureScreen()
 	delete out_stream;
 }
 
-}
+} // namespace devilution
diff --git a/Source/capture.h b/Source/capture.h
index 5c865fd50..a15a91179 100644
--- a/Source/capture.h
+++ b/Source/capture.h
@@ -6,7 +6,7 @@
 #ifndef __CAPTURE_H__
 #define __CAPTURE_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/codec.cpp b/Source/codec.cpp
index a2cccaafa..ef98e069b 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -8,7 +8,7 @@
 #include <cstddef>
 #include <cstdint>
 
-namespace dvl {
+namespace devilution {
 
 typedef struct CodecSignature {
 	DWORD checksum;
@@ -142,4 +142,4 @@ void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, const char *pszPasswo
 	SHA1Clear();
 }
 
-}
+} // namespace devilution
diff --git a/Source/codec.h b/Source/codec.h
index 6287e0435..90a752d3a 100644
--- a/Source/codec.h
+++ b/Source/codec.h
@@ -6,7 +6,7 @@
 #ifndef __CODEC_H__
 #define __CODEC_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/control.cpp b/Source/control.cpp
index c589dbc5a..babdd7684 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -2311,4 +2311,4 @@ BOOL control_presskeys(int vkey)
 	return ret;
 }
 
-}
+} // namespace devilution
diff --git a/Source/control.h b/Source/control.h
index 753a45e17..17fa705af 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -9,7 +9,7 @@
 #include "engine.h"
 #include "spelldat.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 6a310d3cd..1d5386f1a 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Pixel width of the current cursor image */
 int cursW;
@@ -661,4 +661,4 @@ void CheckCursMove()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/cursor.h b/Source/cursor.h
index be29477c8..662dee3e3 100644
--- a/Source/cursor.h
+++ b/Source/cursor.h
@@ -6,7 +6,7 @@
 #ifndef __CURSOR_H__
 #define __CURSOR_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/dead.cpp b/Source/dead.cpp
index 457749d4b..301d2f714 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 DeadStruct dead[MAXDEAD];
 int stonendx;
@@ -91,4 +91,4 @@ void SetDead()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/dead.h b/Source/dead.h
index fd59fc8e7..1ddb3f262 100644
--- a/Source/dead.h
+++ b/Source/dead.h
@@ -6,7 +6,7 @@
 #ifndef __DEAD_H__
 #define __DEAD_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/debug.cpp b/Source/debug.cpp
index caaa88384..14afba0c4 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef _DEBUG
 BOOL update_seed_check = FALSE;
@@ -224,4 +224,4 @@ void NextDebugMonster()
 }
 #endif
 
-}
+} // namespace devilution
diff --git a/Source/debug.h b/Source/debug.h
index db89fba99..32c9beca2 100644
--- a/Source/debug.h
+++ b/Source/debug.h
@@ -6,7 +6,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 96de30691..8d75f62dc 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -11,7 +11,7 @@
 #include "../DiabloUI/diabloui.h"
 #include <config.h>
 
-namespace dvl {
+namespace devilution {
 
 SDL_Window *ghMainWnd;
 DWORD glSeedTbl[NUMLEVELS];
@@ -2094,4 +2094,4 @@ void diablo_color_cyc_logic()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/diablo.h b/Source/diablo.h
index 570930fbe..683b81729 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -11,7 +11,7 @@
 #include "monstdat.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/doom.cpp b/Source/doom.cpp
index 1f6eb1132..b58ad4944 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int doom_quest_time;
 int doom_stars_drawn;
@@ -95,4 +95,4 @@ void doom_draw(CelOutputBuffer out)
 	CelDrawTo(out, PANEL_X, PANEL_Y - 1, pDoomCel, 1, 640);
 }
 
-}
+} // namespace devilution
diff --git a/Source/doom.h b/Source/doom.h
index 8b84b64b2..7fe88721e 100644
--- a/Source/doom.h
+++ b/Source/doom.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index db8af329e..3ead02700 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int UberRow;
 int UberCol;
@@ -2904,4 +2904,4 @@ void drlg_l1_crypt_pattern7(int rndper)
 	drlg_l1_crypt_rndset(byte_48A1DC, rndper);
 }
 
-}
+} // namespace devilution
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 8746dcebd..e55edd170 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -6,7 +6,7 @@
 #ifndef __DRLG_L1_H__
 #define __DRLG_L1_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 4c0cba417..03b22ccd7 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -8,7 +8,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 BYTE predungeon[DMAXX][DMAXY];
 
@@ -3471,4 +3471,4 @@ void CreateL2Dungeon(DWORD rseed, int entry)
 	DRLG_SetPC();
 }
 
-}
+} // namespace devilution
diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h
index 134de5f05..0fad86f29 100644
--- a/Source/drlg_l2.h
+++ b/Source/drlg_l2.h
@@ -6,7 +6,7 @@
 #ifndef __DRLG_L2_H__
 #define __DRLG_L2_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index baf0d3e71..9649525e4 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -8,7 +8,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -2756,4 +2756,4 @@ void LoadPreL3Dungeon(const char *sFileName, int vx, int vy)
 	mem_free_dbg(pLevelMap);
 }
 
-}
+} // namespace devilution
diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h
index d7ff499ec..d5bcd4017 100644
--- a/Source/drlg_l3.h
+++ b/Source/drlg_l3.h
@@ -6,7 +6,7 @@
 #ifndef __DRLG_L3_H__
 #define __DRLG_L3_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index cc46b9b16..d343530e0 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int diabquad1x;
 int diabquad1y;
@@ -1891,4 +1891,4 @@ void LoadPreL4Dungeon(char *sFileName, int vx, int vy)
 	mem_free_dbg(pLevelMap);
 }
 
-}
+} // namespace devilution
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index 7ea7f7bed..43502c1fd 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -6,7 +6,7 @@
 #ifndef __DRLG_L4_H__
 #define __DRLG_L4_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index b633f81d5..e4ca05a4e 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 static CCritSect sgMemCrit;
 SDL_threadID glpDThreadId;
@@ -140,4 +140,4 @@ void dthread_cleanup()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/dthread.h b/Source/dthread.h
index 17010cdec..44afa86d7 100644
--- a/Source/dthread.h
+++ b/Source/dthread.h
@@ -6,7 +6,7 @@
 #ifndef __DTHREAD_H__
 #define __DTHREAD_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/dx.h b/Source/dx.h
index 2de6b77c8..ca19a13c8 100644
--- a/Source/dx.h
+++ b/Source/dx.h
@@ -6,7 +6,7 @@
 #ifndef __DX_H__
 #define __DX_H__
 
-namespace dvl {
+namespace devilution {
 
 CelOutputBuffer GlobalBackBuffer();
 
diff --git a/Source/effects.cpp b/Source/effects.cpp
index bc533e5f4..c2c1b650e 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include <SDL_mixer.h>
 
-namespace dvl {
+namespace devilution {
 
 int sfxdelay;
 int sfxdnum;
@@ -1420,4 +1420,4 @@ int GetSFXLength(int nSFX)
 	return sgSFX[nSFX].pSnd->DSB->GetLength();
 }
 
-}
+} // namespace devilution
diff --git a/Source/effects.h b/Source/effects.h
index 6533691db..4426105b9 100644
--- a/Source/effects.h
+++ b/Source/effects.h
@@ -8,7 +8,7 @@
 
 #include "sound.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index 4fda4b945..c9dea99b6 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "../3rdParty/PKWare/pkware.h"
 
-namespace dvl {
+namespace devilution {
 
 DWORD hashtable[5][256];
 
@@ -161,4 +161,4 @@ void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes)
 	mem_free_dbg(pbOutBuff);
 }
 
-}
+} // namespace devilution
diff --git a/Source/encrypt.h b/Source/encrypt.h
index c4b2a4036..11b871c4e 100644
--- a/Source/encrypt.h
+++ b/Source/encrypt.h
@@ -6,7 +6,7 @@
 #ifndef __ENCRYPT_H__
 #define __ENCRYPT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/engine.cpp b/Source/engine.cpp
index 02daf3da3..97f62c127 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -14,7 +14,7 @@
 #include "options.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Seed value before the most recent call to SetRndSeed() */
 Sint32 orgseed;
@@ -1084,4 +1084,4 @@ void PlayInGameMovie(const char *pszMovie)
 	force_redraw = 255;
 }
 
-}
+} // namespace devilution
diff --git a/Source/engine.h b/Source/engine.h
index 888a21cc9..e375d684b 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -25,7 +25,7 @@
 
 #include "../types.h"
 
-namespace dvl {
+namespace devilution {
 
 // `malloc` that returns a user-friendly error on OOM.
 //
diff --git a/Source/error.cpp b/Source/error.cpp
index c6e7a8778..6c86c1355 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 char msgtable[MAX_SEND_STR_LEN];
 DWORD msgdelay;
@@ -162,4 +162,4 @@ void DrawDiabloMsg(CelOutputBuffer out)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/error.h b/Source/error.h
index 664e53f65..e72afdc1c 100644
--- a/Source/error.h
+++ b/Source/error.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index 6357ff020..f90fec54a 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -7,7 +7,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 bool gbRunInTown = false;
 
@@ -396,4 +396,4 @@ void gamemenu_color_cycling(BOOL bActivate)
 	sgOptionsMenu[3].pszStr = color_cycling_toggle_names[sgOptions.Graphics.bColorCycling ? 1 : 0];
 }
 
-}
+} // namespace devilution
diff --git a/Source/gamemenu.h b/Source/gamemenu.h
index 166baaf1c..25697b196 100644
--- a/Source/gamemenu.h
+++ b/Source/gamemenu.h
@@ -6,7 +6,7 @@
 #ifndef __GAMEMENU_H__
 #define __GAMEMENU_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index b41340958..8d7e3baef 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Contains the tile IDs of the map. */
 BYTE dungeon[DMAXX][DMAXY];
@@ -604,4 +604,4 @@ void InitLevels()
 	setlevel = FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/gendung.h b/Source/gendung.h
index 6dd2b55d7..89f29044c 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -6,7 +6,7 @@
 #ifndef __GENDUNG_H__
 #define __GENDUNG_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index a16c74ddb..318f3b091 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -8,7 +8,7 @@
 #include "../SourceX/controls/axis_direction.h"
 #include "../SourceX/controls/controller_motion.h"
 
-namespace dvl {
+namespace devilution {
 
 BYTE *optbar_cel;
 BOOLEAN mouseNavigation;
@@ -436,4 +436,4 @@ void gmenu_slider_steps(TMenuItem *pItem, int steps)
 	pItem->dwFlags |= (steps << 12) & 0xFFF000;
 }
 
-}
+} // namespace devilution
diff --git a/Source/gmenu.h b/Source/gmenu.h
index e397a4c62..ee0f715ae 100644
--- a/Source/gmenu.h
+++ b/Source/gmenu.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/help.cpp b/Source/help.cpp
index bf9916599..845401ea6 100644
--- a/Source/help.cpp
+++ b/Source/help.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int help_select_line;
 BOOL helpflag;
@@ -586,4 +586,4 @@ void HelpScrollDown()
 		help_select_line++;
 }
 
-}
+} // namespace devilution
diff --git a/Source/help.h b/Source/help.h
index 022bb79f0..75976d2ab 100644
--- a/Source/help.h
+++ b/Source/help.h
@@ -6,7 +6,7 @@
 #ifndef __HELP_H__
 #define __HELP_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/init.cpp b/Source/init.cpp
index 6e8180512..3085a5dab 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -18,7 +18,7 @@
 int _newlib_heap_size_user = 100 * 1024 * 1024;
 #endif
 
-namespace dvl {
+namespace devilution {
 
 /** True if the game is the current active window */
 int gbActive;
@@ -231,4 +231,4 @@ WNDPROC SetWindowProc(WNDPROC NewProc)
 	return OldProc;
 }
 
-}
+} // namespace devilution
diff --git a/Source/init.h b/Source/init.h
index 917ab4ffd..05d216c0b 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -6,7 +6,7 @@
 #ifndef __INIT_H__
 #define __INIT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 1c39efd87..c1cba3000 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "../SourceX/DiabloUI/art_draw.h"
 
-namespace dvl {
+namespace devilution {
 
 BYTE *sgpBackCel;
 Uint32 sgdwProgress;
@@ -387,4 +387,4 @@ void ShowProgress(interface_mode uMsg)
 	gbSomebodyWonGameKludge = FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/interfac.h b/Source/interfac.h
index 45c56e956..cebc2705e 100644
--- a/Source/interfac.h
+++ b/Source/interfac.h
@@ -6,7 +6,7 @@
 #ifndef __INTERFAC_H__
 #define __INTERFAC_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/inv.cpp b/Source/inv.cpp
index bd0c5e252..2f5e8444a 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 BOOL invflag;
 BYTE *pInvCels;
@@ -2871,4 +2871,4 @@ BOOL DropItemBeforeTrig()
 	return FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/inv.h b/Source/inv.h
index 6a671abcb..f639a4990 100644
--- a/Source/inv.h
+++ b/Source/inv.h
@@ -9,7 +9,7 @@
 #include "items.h"
 #include "player.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp
index 1b5853da7..f94a1d3d9 100644
--- a/Source/itemdat.cpp
+++ b/Source/itemdat.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Contains the data related to each item ID. */
 ItemDataStruct AllItemsList[] = {
@@ -500,4 +500,4 @@ const UItemStruct UniqueItemList[] = {
 	// clang-format on
 };
 
-}
+} // namespace devilution
diff --git a/Source/itemdat.h b/Source/itemdat.h
index ed4ef7833..088b6ec9e 100644
--- a/Source/itemdat.h
+++ b/Source/itemdat.h
@@ -6,7 +6,7 @@
 #ifndef __ITEMDAT_H__
 #define __ITEMDAT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/items.cpp b/Source/items.cpp
index 9dba8b9e0..c05ad7930 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -7,7 +7,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 int itemactive[MAXITEMS];
 BOOL uitemflag;
@@ -5472,4 +5472,4 @@ void PutItemRecord(int nSeed, WORD wCI, int nIndex)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/items.h b/Source/items.h
index d84d7d9b7..ec92e174e 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -8,7 +8,7 @@
 
 #include "itemdat.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index f7b552681..2d9dd796f 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 LightListStruct VisionList[MAXVISION];
 BYTE lightactive[MAXLIGHTS];
@@ -1297,4 +1297,4 @@ void lighting_color_cycling()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/lighting.h b/Source/lighting.h
index 2cdb14a56..9dd3f3e46 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -6,7 +6,7 @@
 #ifndef __LIGHTING_H__
 #define __LIGHTING_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index bf76ab33f..c7387b95a 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 bool gbIsHellfireSaveGame;
 int giNumberOfLevels;
@@ -181,7 +181,7 @@ public:
 	}
 };
 
-}
+} // namespace
 
 void RemoveInvalidItem(ItemStruct *pItem)
 {
@@ -2090,4 +2090,4 @@ void LoadLevel()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/loadsave.h b/Source/loadsave.h
index 3e821c244..5b12d5fdd 100644
--- a/Source/loadsave.h
+++ b/Source/loadsave.h
@@ -8,7 +8,7 @@
 
 #include "player.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index 308c3b1cb..07ac09023 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -8,7 +8,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
-namespace dvl {
+namespace devilution {
 
 char gszHero[16];
 
@@ -156,4 +156,4 @@ void mainmenu_loop()
 	music_stop();
 }
 
-}
+} // namespace devilution
diff --git a/Source/mainmenu.h b/Source/mainmenu.h
index 2509f11d8..6c059970d 100644
--- a/Source/mainmenu.h
+++ b/Source/mainmenu.h
@@ -8,7 +8,7 @@
 
 #include "multi.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 2db53ac36..973b95a7a 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Specify if the quest dialog window is being shown */
 bool qtextflag;
@@ -260,4 +260,4 @@ void DrawQText(CelOutputBuffer out)
 	DrawQTextContent(out);
 }
 
-}
+} // namespace devilution
diff --git a/Source/minitext.h b/Source/minitext.h
index f5ca0efaf..940be674a 100644
--- a/Source/minitext.h
+++ b/Source/minitext.h
@@ -6,7 +6,7 @@
 #ifndef __MINITEXT_H__
 #define __MINITEXT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/misdat.cpp b/Source/misdat.cpp
index 28b8a9b53..cc46a516e 100644
--- a/Source/misdat.cpp
+++ b/Source/misdat.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Data related to each missile ID. */
 MissileData missiledata[] = {
@@ -189,4 +189,4 @@ MisFileData misfiledata[] = {
 	// clang-format on
 };
 
-}
+} // namespace devilution
diff --git a/Source/misdat.h b/Source/misdat.h
index 622ffcddd..ef7993891 100644
--- a/Source/misdat.h
+++ b/Source/misdat.h
@@ -8,7 +8,7 @@
 
 #include "missiles.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index a5e018aba..1b9f42e46 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int missileactive[MAXMISSILES];
 int missileavail[MAXMISSILES];
@@ -5671,4 +5671,4 @@ void ClearMissileSpot(int mi)
 	dMissile[missile[mi]._mix][missile[mi]._miy] = 0;
 }
 
-}
+} // namespace devilution
diff --git a/Source/missiles.h b/Source/missiles.h
index 0ad7231fd..b6b7f99b5 100644
--- a/Source/missiles.h
+++ b/Source/missiles.h
@@ -6,7 +6,7 @@
 #ifndef __MISSILES_H__
 #define __MISSILES_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp
index 234d54633..dd70aaa1f 100644
--- a/Source/monstdat.cpp
+++ b/Source/monstdat.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Contains the data related to each monster ID. */
 const MonsterData monsterdata[] = {
@@ -566,4 +566,4 @@ const UniqMonstStruct UniqMonst[] = {
 	// clang-format on
 };
 
-}
+} // namespace devilution
diff --git a/Source/monstdat.h b/Source/monstdat.h
index 4be40d5c0..9e6404a58 100644
--- a/Source/monstdat.h
+++ b/Source/monstdat.h
@@ -6,7 +6,7 @@
 #ifndef __MONSTDAT_H__
 #define __MONSTDAT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 00f81a492..0ebe7c63b 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -9,7 +9,7 @@
 #include "options.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Tracks which missile files are already loaded */
 int MissileFileFlag;
@@ -5707,4 +5707,4 @@ void decode_enemy(int m, int enemy)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/monster.h b/Source/monster.h
index 0569f9c5e..4395896ee 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -6,7 +6,7 @@
 #ifndef __MONSTER_H__
 #define __MONSTER_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 20848ca51..e45bfa3fe 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -7,7 +7,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../SourceX/display.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Should the movie continue playing. */
 BYTE movie_playing;
@@ -56,4 +56,4 @@ void play_movie(const char *pszMovie, BOOL user_can_close)
 	OutputToLogical(&MouseX, &MouseY);
 }
 
-}
+} // namespace devilution
diff --git a/Source/movie.h b/Source/movie.h
index a9081437a..69a6f25a2 100644
--- a/Source/movie.h
+++ b/Source/movie.h
@@ -6,7 +6,7 @@
 #ifndef __MOVIE_H__
 #define __MOVIE_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 0cd04dcb1..352249e0a 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -14,7 +14,7 @@
 #include "all.h"
 #include "../SourceS/file_util.h"
 
-namespace dvl {
+namespace devilution {
 
 #define INDEX_ENTRIES 2048
 
@@ -704,4 +704,4 @@ BOOL mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, DWORD dwChar)
 	return cur_archive.Close(/*clear_tables=*/bFree);
 }
 
-}
+} // namespace devilution
diff --git a/Source/mpqapi.h b/Source/mpqapi.h
index 34dd6894b..1684a08f7 100644
--- a/Source/mpqapi.h
+++ b/Source/mpqapi.h
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 4b60db7f7..bcd44506b 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -8,7 +8,7 @@
 #include "../DiabloUI/diabloui.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 static DWORD sgdwOwnerWait;
 static DWORD sgdwRecvOffset;
@@ -2685,4 +2685,4 @@ DWORD ParseCmd(int pnum, TCmd *pCmd)
 	return On_DLEVEL(pnum, pCmd);
 }
 
-}
+} // namespace devilution
diff --git a/Source/msg.h b/Source/msg.h
index e22ceae13..2cce50b71 100644
--- a/Source/msg.h
+++ b/Source/msg.h
@@ -6,7 +6,7 @@
 #ifndef __MSG_H__
 #define __MSG_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/multi.cpp b/Source/multi.cpp
index d88974071..4b3197338 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -9,7 +9,7 @@
 #include "../DiabloUI/diabloui.h"
 #include <config.h>
 
-namespace dvl {
+namespace devilution {
 
 BOOLEAN gbSomebodyWonGameKludge;
 TBuffer sgHiPriBuf;
@@ -919,4 +919,4 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/multi.h b/Source/multi.h
index 958d6f269..ca157a9e7 100644
--- a/Source/multi.h
+++ b/Source/multi.h
@@ -8,7 +8,7 @@
 
 #include "msg.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index d092e3a10..575797cb3 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 BYTE sgbNetUpdateRate;
 DWORD gdwMsgLenTbl[MAX_PLRS];
@@ -242,4 +242,4 @@ BOOL nthread_has_500ms_passed()
 	return ticksElapsed >= 0;
 }
 
-}
+} // namespace devilution
diff --git a/Source/nthread.h b/Source/nthread.h
index 7285f4670..78b47a9e5 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -6,7 +6,7 @@
 #ifndef __NTHREAD_H__
 #define __NTHREAD_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/objdat.cpp b/Source/objdat.cpp
index 732240bcf..97620ca96 100644
--- a/Source/objdat.cpp
+++ b/Source/objdat.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Maps from dun_object_id to object_id. */
 const _object_id ObjTypeConv[] = {
@@ -435,4 +435,4 @@ const char *ObjHiveLoadList[] = {
 	"LzStand",
 };
 
-}
+} // namespace devilution
diff --git a/Source/objdat.h b/Source/objdat.h
index d90b77e18..3a893fb83 100644
--- a/Source/objdat.h
+++ b/Source/objdat.h
@@ -6,7 +6,7 @@
 #ifndef __OBJDAT_H__
 #define __OBJDAT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 98c5e5922..1aa042819 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 int trapid;
 int trapdir;
@@ -5271,4 +5271,4 @@ bool objects_lv_24_454B04(int s)
 	return FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/objects.h b/Source/objects.h
index 13ab2d09d..3872c0bcc 100644
--- a/Source/objects.h
+++ b/Source/objects.h
@@ -6,7 +6,7 @@
 #ifndef __OBJECTS_H__
 #define __OBJECTS_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/options.h b/Source/options.h
index 4378d1397..78d2d4f8f 100644
--- a/Source/options.h
+++ b/Source/options.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 struct DiabloOptions {
 	/** @brief Play game intro video on startup. */
diff --git a/Source/pack.cpp b/Source/pack.cpp
index f98e72918..605528bf9 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 void PackItem(PkItemStruct *id, const ItemStruct *is)
 {
@@ -301,4 +301,4 @@ void UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOL netSync)
 	pPlayer->pDamAcFlags = SwapLE32(pPack->pDamAcFlags);
 }
 
-}
+} // namespace devilution
diff --git a/Source/pack.h b/Source/pack.h
index 8e520ebd9..0fc9ab2cd 100644
--- a/Source/pack.h
+++ b/Source/pack.h
@@ -8,7 +8,7 @@
 
 #include "items.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/palette.cpp b/Source/palette.cpp
index ff7a15d79..191b88762 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -8,7 +8,7 @@
 #include "../SourceX/display.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 SDL_Color logical_palette[256];
 SDL_Color system_palette[256];
@@ -383,4 +383,4 @@ void palette_update_quest_palette(int n)
 	GenerateBlendedLookupTable(logical_palette, 1, 31, 32 - n); // Possible optimization would be to only update color 0 as only the UI can overlap with transparency in this quest
 }
 
-}
+} // namespace devilution
diff --git a/Source/palette.h b/Source/palette.h
index e732edb4e..d60807792 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -6,7 +6,7 @@
 #ifndef __PALETTE_H__
 #define __PALETTE_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/path.cpp b/Source/path.cpp
index 08cc34293..ace3298fa 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 /** Notes visisted by the path finding algorithm. */
 PATHNODE path_nodes[MAXPATHNODES];
 /** size of the pnode_tblptr stack */
@@ -379,4 +379,4 @@ PATHNODE *path_new_step()
 	return new_node;
 }
 
-}
+} // namespace devilution
diff --git a/Source/path.h b/Source/path.h
index 5cb6591de..4c2dba55f 100644
--- a/Source/path.h
+++ b/Source/path.h
@@ -6,7 +6,7 @@
 #ifndef __PATH_H__
 #define __PATH_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 99972cfee..2fe56d087 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -10,7 +10,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 #include "file_util.h"
 
-namespace dvl {
+namespace devilution {
 
 #define PASSWORD_SPAWN_SINGLE "adslhfb1"
 #define PASSWORD_SPAWN_MULTI "lshbkfg1"
@@ -551,4 +551,4 @@ void pfile_update(bool force_save)
 	pfile_write_hero();
 }
 
-}
+} // namespace devilution
diff --git a/Source/pfile.h b/Source/pfile.h
index 5ef1e4c03..54174b903 100644
--- a/Source/pfile.h
+++ b/Source/pfile.h
@@ -9,7 +9,7 @@
 #include "player.h"
 #include "../DiabloUI/diabloui.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/player.cpp b/Source/player.cpp
index 4a86df5e8..adadf8efb 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -9,7 +9,7 @@
 #include "options.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 int plr_lframe_size;
 int plr_wframe_size;
@@ -4411,4 +4411,4 @@ int get_max_dexterity(int i)
 	return MaxStats[i][ATTRIB_DEX];
 }
 
-}
+} // namespace devilution
diff --git a/Source/player.h b/Source/player.h
index 76bbc2060..a398552dd 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -6,7 +6,7 @@
 #ifndef __PLAYER_H__
 #define __PLAYER_H__
 
-namespace dvl {
+namespace devilution {
 
 typedef enum PLR_MODE {
 	PM_STAND,
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index 559c2e0dc..be587f110 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 static BYTE plr_msg_slot;
 _plrmsg plr_msgs[PMSG_COUNT];
@@ -152,4 +152,4 @@ void DrawPlrMsg(CelOutputBuffer out)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/plrmsg.h b/Source/plrmsg.h
index 66482ff82..6e9325b4b 100644
--- a/Source/plrmsg.h
+++ b/Source/plrmsg.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/portal.cpp b/Source/portal.cpp
index fd544d8bc..f03dd0343 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** In-game state of portals. */
 PortalStruct portal[MAXPORTAL];
@@ -183,4 +183,4 @@ BOOL PosOkPortal(int lvl, int x, int y)
 	return FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/portal.h b/Source/portal.h
index 8a3c55154..53cb4ec4c 100644
--- a/Source/portal.h
+++ b/Source/portal.h
@@ -6,7 +6,7 @@
 #ifndef __PORTAL_H__
 #define __PORTAL_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/quests.cpp b/Source/quests.cpp
index f180f9e2e..f237bff18 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 int qtopline;
 bool questlog;
@@ -944,4 +944,4 @@ void SetMultiQuest(int q, int s, int l, int v1)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/quests.h b/Source/quests.h
index 025b91c8d..823eabfab 100644
--- a/Source/quests.h
+++ b/Source/quests.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/render.cpp b/Source/render.cpp
index ed7f6943b..24bd73e06 100644
--- a/Source/render.cpp
+++ b/Source/render.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 #define NO_OVERDRAW
 
@@ -616,4 +616,4 @@ void world_draw_black_tile(CelOutputBuffer out, int sx, int sy)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/render.h b/Source/render.h
index 4dbf27002..180c6b716 100644
--- a/Source/render.h
+++ b/Source/render.h
@@ -6,7 +6,7 @@
 #ifndef __RENDER_H__
 #define __RENDER_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index 94b42629b..6f7a4775b 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "paths.h"
 
-namespace dvl {
+namespace devilution {
 
 /**
  * @brief Check that we have write access to the game install folder
@@ -24,4 +24,4 @@ void ReadOnlyTest()
 	remove(path.c_str());
 }
 
-}
+} // namespace devilution
diff --git a/Source/restrict.h b/Source/restrict.h
index b45ac6291..5ab212a56 100644
--- a/Source/restrict.h
+++ b/Source/restrict.h
@@ -6,7 +6,7 @@
 #ifndef __RESTRICT_H__
 #define __RESTRICT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 14459c47a..d5ec04050 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /**
  * Specifies the current light entry.
@@ -1557,4 +1557,4 @@ void DrawAndBlit()
 	drawsbarflag = FALSE;
 }
 
-}
+} // namespace devilution
diff --git a/Source/scrollrt.h b/Source/scrollrt.h
index 0d2203758..9af11f1f0 100644
--- a/Source/scrollrt.h
+++ b/Source/scrollrt.h
@@ -6,7 +6,7 @@
 #ifndef __SCROLLRT_H__
 #define __SCROLLRT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index 00e7932e2..6a6e47bf2 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 // BUGFIX: constant data should be const
 BYTE SkelKingTrans1[] = {
@@ -199,4 +199,4 @@ void LoadSetMap()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/setmaps.h b/Source/setmaps.h
index 04b296b74..eeb386bd2 100644
--- a/Source/setmaps.h
+++ b/Source/setmaps.h
@@ -6,7 +6,7 @@
 #ifndef __SETMAPS_H__
 #define __SETMAPS_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/sha.cpp b/Source/sha.cpp
index 52fb38621..ab9c05d02 100644
--- a/Source/sha.cpp
+++ b/Source/sha.cpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-namespace dvl {
+namespace devilution {
 
 // NOTE: Diablo's "SHA1" is different from actual SHA1 in that it uses arithmetic
 // right shifts (sign bit extension).
@@ -158,4 +158,4 @@ void SHA1Reset(int n)
 	SHA1Init(&sgSHA1[n]);
 }
 
-}
+} // namespace devilution
diff --git a/Source/sha.h b/Source/sha.h
index 33699cbbb..e84236bf8 100644
--- a/Source/sha.h
+++ b/Source/sha.h
@@ -6,7 +6,7 @@
 #ifndef __SHA_H__
 #define __SHA_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/sound.h b/Source/sound.h
index 3a8bbe400..20988e5b0 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -6,7 +6,7 @@
 #ifndef __SOUND_H__
 #define __SOUND_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp
index e32ebbfdc..dbdf1202b 100644
--- a/Source/spelldat.cpp
+++ b/Source/spelldat.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 /** Data related to each spell ID. */
 SpellData spelldata[] = {
@@ -66,4 +66,4 @@ SpellData spelldata[] = {
 	// clang-format on
 };
 
-}
+} // namespace devilution
diff --git a/Source/spelldat.h b/Source/spelldat.h
index 00231c647..b721ecb71 100644
--- a/Source/spelldat.h
+++ b/Source/spelldat.h
@@ -6,7 +6,7 @@
 #ifndef __SPELLDAT_H__
 #define __SPELLDAT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/spells.cpp b/Source/spells.cpp
index b81aacfd3..525e2223d 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int GetManaAmount(int id, int sn)
 {
@@ -413,4 +413,4 @@ int GetSpellStaffLevel(spell_id s)
 	return spelldata[s].sStaffLvl;
 }
 
-}
+} // namespace devilution
diff --git a/Source/spells.h b/Source/spells.h
index 37a14d5c3..84133d208 100644
--- a/Source/spells.h
+++ b/Source/spells.h
@@ -6,7 +6,7 @@
 #ifndef __SPELLS_H__
 #define __SPELLS_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/stores.cpp b/Source/stores.cpp
index 8956f37bd..dcdd5ca09 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -7,7 +7,7 @@
 #include "options.h"
 #include <algorithm>
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -2160,7 +2160,7 @@ void S_DrunkEnter()
 	}
 }
 
-}
+} // namespace
 
 ItemStruct golditem;
 
@@ -2910,4 +2910,4 @@ void ReleaseStoreBtn()
 	stextscrldbtn = -1;
 }
 
-}
+} // namespace devilution
diff --git a/Source/stores.h b/Source/stores.h
index 56791f73f..e63c2b474 100644
--- a/Source/stores.h
+++ b/Source/stores.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/sync.cpp b/Source/sync.cpp
index fa9f58b66..1b3288930 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -152,7 +152,7 @@ static void SyncPlrInv(TSyncHeader *pHdr)
 	}
 }
 
-}
+} // namespace
 
 Uint32 sync_all_monsters(const Uint8 *pbBuf, Uint32 dwMaxLen)
 {
@@ -289,4 +289,4 @@ void sync_init()
 	memset(sgwLRU, 255, sizeof(sgwLRU));
 }
 
-}
+} // namespace devilution
diff --git a/Source/sync.h b/Source/sync.h
index b4cb37424..a1d21b00d 100644
--- a/Source/sync.h
+++ b/Source/sync.h
@@ -6,7 +6,7 @@
 #ifndef __SYNC_H__
 #define __SYNC_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/textdat.cpp b/Source/textdat.cpp
index 0fd946f76..612f63359 100644
--- a/Source/textdat.cpp
+++ b/Source/textdat.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "textdat.h"
 
-namespace dvl {
+namespace devilution {
 
 /* todo: move text out of struct */
 
@@ -738,4 +738,4 @@ const TextDataStruct alltext[] = {
 */
 };
 
-}
+} // namespace devilution
diff --git a/Source/textdat.h b/Source/textdat.h
index 731662617..bcdc6d366 100644
--- a/Source/textdat.h
+++ b/Source/textdat.h
@@ -6,7 +6,7 @@
 #ifndef __TEXTDAT_H__
 #define __TEXTDAT_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/themes.cpp b/Source/themes.cpp
index c42ece10b..9e7792639 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 int numthemes;
 BOOL armorFlag;
@@ -1066,4 +1066,4 @@ void CreateThemeRooms()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/themes.h b/Source/themes.h
index 716a6d733..75a6cb819 100644
--- a/Source/themes.h
+++ b/Source/themes.h
@@ -6,7 +6,7 @@
 #ifndef __THEMES_H__
 #define __THEMES_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index 02843997b..ddb5c6772 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -5,13 +5,13 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
 TMsg *sgpTimedMsgHead;
 
-}
+} // namespace
 
 int tmsg_get(Uint8 *pbMsg, Uint32 dwMaxLen)
 {
@@ -63,4 +63,4 @@ void tmsg_cleanup()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/tmsg.h b/Source/tmsg.h
index c2bdbf2f0..d2ec6cb83 100644
--- a/Source/tmsg.h
+++ b/Source/tmsg.h
@@ -6,7 +6,7 @@
 #ifndef __TMSG_H__
 #define __TMSG_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/town.cpp b/Source/town.cpp
index 647f2d6b6..7a56fdddd 100644
--- a/Source/town.cpp
+++ b/Source/town.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -220,7 +220,7 @@ void T_Pass3()
 	mem_free_dbg(P3Tiles);
 }
 
-}
+} // namespace
 
 /**
  * @brief Update the map to show the open hive
@@ -385,4 +385,4 @@ void CreateTown(int entry)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/town.h b/Source/town.h
index e1ba5fba7..eb38685e3 100644
--- a/Source/town.h
+++ b/Source/town.h
@@ -6,7 +6,7 @@
 #ifndef __TOWN_H__
 #define __TOWN_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 3e48a15ec..4e60198e0 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 BOOL storeflag;
 int sgnCowMsg;
@@ -1302,4 +1302,4 @@ void TalkToTowner(int p, int t)
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/towners.h b/Source/towners.h
index d1974c611..53dee850b 100644
--- a/Source/towners.h
+++ b/Source/towners.h
@@ -6,7 +6,7 @@
 #ifndef __TOWNERS_H__
 #define __TOWNERS_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/track.cpp b/Source/track.cpp
index 0d53e3e16..63c389542 100644
--- a/Source/track.cpp
+++ b/Source/track.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -13,7 +13,7 @@ BYTE sgbIsScrolling;
 Uint32 sgdwLastWalk;
 bool sgbIsWalking;
 
-}
+} // namespace
 
 void track_process()
 {
@@ -57,4 +57,4 @@ bool track_isscrolling()
 	return sgbIsScrolling;
 }
 
-}
+} // namespace devilution
diff --git a/Source/track.h b/Source/track.h
index c22a0b51c..86b1f18df 100644
--- a/Source/track.h
+++ b/Source/track.h
@@ -6,7 +6,7 @@
 #ifndef __TRACK_H__
 #define __TRACK_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index 47a0f37cc..5ff0bff74 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -5,7 +5,7 @@
  */
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 BOOL townwarps[3];
 BOOL trigflag;
@@ -922,4 +922,4 @@ void CheckTriggers()
 	}
 }
 
-}
+} // namespace devilution
diff --git a/Source/trigs.h b/Source/trigs.h
index 0047e3623..b5b7f41c4 100644
--- a/Source/trigs.h
+++ b/Source/trigs.h
@@ -6,7 +6,7 @@
 #ifndef __TRIGS_H__
 #define __TRIGS_H__
 
-namespace dvl {
+namespace devilution {
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/SourceS/console.h b/SourceS/console.h
index 614efa848..61ef7053c 100644
--- a/SourceS/console.h
+++ b/SourceS/console.h
@@ -6,7 +6,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-namespace dvl {
+namespace devilution {
 
 void printInConsole(const char *fmt, ...)
 {
diff --git a/SourceS/file_util.h b/SourceS/file_util.h
index 88851e45d..9a5b318a0 100644
--- a/SourceS/file_util.h
+++ b/SourceS/file_util.h
@@ -24,7 +24,7 @@
 #include <cstdio>
 #endif
 
-namespace dvl {
+namespace devilution {
 
 inline bool FileExists(const char *path)
 {
diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h
index 0415d569a..a99bf8362 100644
--- a/SourceS/miniwin/misc.h
+++ b/SourceS/miniwin/misc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 typedef uint16_t SHORT;
 typedef int32_t LONG;
diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp
index dd60fcb52..c089e964b 100644
--- a/SourceS/paths.cpp
+++ b/SourceS/paths.cpp
@@ -14,7 +14,7 @@
 #define TTF_FONT_NAME "CharisSILB.ttf"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -128,4 +128,4 @@ void SetTtfName(const char *path)
 	*ttfName = path;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceS/paths.h b/SourceS/paths.h
index ce7e9d43a..ac4e697eb 100644
--- a/SourceS/paths.h
+++ b/SourceS/paths.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-namespace dvl {
+namespace devilution {
 
 const std::string &GetBasePath();
 const std::string &GetPrefPath();
diff --git a/SourceS/soundsample.h b/SourceS/soundsample.h
index 08fa0a547..9ef3aa336 100644
--- a/SourceS/soundsample.h
+++ b/SourceS/soundsample.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <SDL_mixer.h>
 
-namespace dvl {
+namespace devilution {
 
 class SoundSample final {
 public:
diff --git a/SourceS/storm_full.h b/SourceS/storm_full.h
index aecc541a8..351e59cb2 100644
--- a/SourceS/storm_full.h
+++ b/SourceS/storm_full.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 extern "C" {
 
 extern DWORD nLastError;
diff --git a/SourceS/thread.h b/SourceS/thread.h
index 13a619077..179e6e16c 100644
--- a/SourceS/thread.h
+++ b/SourceS/thread.h
@@ -6,7 +6,7 @@
 #include "sdl2_to_1_2_backports.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 typedef struct event_emul {
 	SDL_mutex *mutex;
diff --git a/SourceS/ui_fwd.h b/SourceS/ui_fwd.h
index 905cde83c..b6ddafbfa 100644
--- a/SourceS/ui_fwd.h
+++ b/SourceS/ui_fwd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 extern Uint16 gnScreenWidth;
 extern Uint16 gnScreenHeight;
diff --git a/SourceT/appfat_test.cpp b/SourceT/appfat_test.cpp
index 6a57c8f13..ee8149912 100644
--- a/SourceT/appfat_test.cpp
+++ b/SourceT/appfat_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Appfat, app_fatal)
 {
diff --git a/SourceT/automap_test.cpp b/SourceT/automap_test.cpp
index 2a6769db3..2855f825d 100644
--- a/SourceT/automap_test.cpp
+++ b/SourceT/automap_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Automap, InitAutomap)
 {
diff --git a/SourceT/codec_test.cpp b/SourceT/codec_test.cpp
index afbd82485..7c9359f30 100644
--- a/SourceT/codec_test.cpp
+++ b/SourceT/codec_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Codec, codec_get_encoded_len)
 {
diff --git a/SourceT/control_test.cpp b/SourceT/control_test.cpp
index 28be9057d..f2dbcea25 100644
--- a/SourceT/control_test.cpp
+++ b/SourceT/control_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Control, SetSpell)
 {
diff --git a/SourceT/cursor_test.cpp b/SourceT/cursor_test.cpp
index b0d2a4a1f..535dbcff8 100644
--- a/SourceT/cursor_test.cpp
+++ b/SourceT/cursor_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Cursor, SetCursor)
 {
diff --git a/SourceT/dead_test.cpp b/SourceT/dead_test.cpp
index db56b5a39..abb60218c 100644
--- a/SourceT/dead_test.cpp
+++ b/SourceT/dead_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Dead, AddDead)
 {
diff --git a/SourceT/diablo_test.cpp b/SourceT/diablo_test.cpp
index 76cac19e8..4a671b319 100644
--- a/SourceT/diablo_test.cpp
+++ b/SourceT/diablo_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Diablo, diablo_pause_game_unpause)
 {
diff --git a/SourceT/doom_test.cpp b/SourceT/doom_test.cpp
index 10fb00fd5..44b7d7db7 100644
--- a/SourceT/doom_test.cpp
+++ b/SourceT/doom_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Doom, doom_get_frame_from_time)
 {
diff --git a/SourceT/drlg_l1_test.cpp b/SourceT/drlg_l1_test.cpp
index c21fd2a7a..db501eb6d 100644
--- a/SourceT/drlg_l1_test.cpp
+++ b/SourceT/drlg_l1_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Drlg_l1, DRLG_Init_Globals_4flag)
 {
diff --git a/SourceT/drlg_l2_test.cpp b/SourceT/drlg_l2_test.cpp
index 944497beb..c516b964d 100644
--- a/SourceT/drlg_l2_test.cpp
+++ b/SourceT/drlg_l2_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Drlg_l2, InitDungeon)
 {
diff --git a/SourceT/drlg_l3_test.cpp b/SourceT/drlg_l3_test.cpp
index 43703b126..fc3220a87 100644
--- a/SourceT/drlg_l3_test.cpp
+++ b/SourceT/drlg_l3_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Drlg_l3, AddFenceDoors_x)
 {
diff --git a/SourceT/drlg_l4_test.cpp b/SourceT/drlg_l4_test.cpp
index 53fb15e2e..bfe1efbd5 100644
--- a/SourceT/drlg_l4_test.cpp
+++ b/SourceT/drlg_l4_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Drlg_l4, IsDURWall)
 {
diff --git a/SourceT/effects_test.cpp b/SourceT/effects_test.cpp
index 0e672c752..a2db1b620 100644
--- a/SourceT/effects_test.cpp
+++ b/SourceT/effects_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Effects, calc_snd_position_center)
 {
diff --git a/SourceT/file_util_test.cpp b/SourceT/file_util_test.cpp
index 8df00012b..e7ba61ef8 100644
--- a/SourceT/file_util_test.cpp
+++ b/SourceT/file_util_test.cpp
@@ -5,7 +5,7 @@
 
 #include "file_util.h"
 
-using namespace dvl;
+using namespace devilution;
 
 namespace {
 
diff --git a/SourceT/inv_test.cpp b/SourceT/inv_test.cpp
index dc5eb10b2..484aeb848 100644
--- a/SourceT/inv_test.cpp
+++ b/SourceT/inv_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 /* Set up a given item as a spell scroll, allowing for its usage. */
 void set_up_scroll(ItemStruct &item, spell_id spell)
diff --git a/SourceT/lighting_test.cpp b/SourceT/lighting_test.cpp
index 189d65119..176ac6fe6 100644
--- a/SourceT/lighting_test.cpp
+++ b/SourceT/lighting_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Lighting, CrawlTables)
 {
diff --git a/SourceT/missiles_test.cpp b/SourceT/missiles_test.cpp
index 0f0c3e893..5cdd03bda 100644
--- a/SourceT/missiles_test.cpp
+++ b/SourceT/missiles_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 TEST(Missiles, GetDirection8)
 {
diff --git a/SourceT/pack_test.cpp b/SourceT/pack_test.cpp
index a783c4e84..33f5cb84f 100644
--- a/SourceT/pack_test.cpp
+++ b/SourceT/pack_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 static void ComparePackedItems(const PkItemStruct *item1, const PkItemStruct *item2)
 {
diff --git a/SourceT/player_test.cpp b/SourceT/player_test.cpp
index 4b3b16501..0a2b746b9 100644
--- a/SourceT/player_test.cpp
+++ b/SourceT/player_test.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
-namespace dvl {
+namespace devilution {
 extern int PM_DoGotHit(int pnum);
 }
 
diff --git a/SourceT/scrollrt_test.cpp b/SourceT/scrollrt_test.cpp
index 6bb746c7c..341420291 100644
--- a/SourceT/scrollrt_test.cpp
+++ b/SourceT/scrollrt_test.cpp
@@ -2,7 +2,7 @@
 #include "all.h"
 #include "ui_fwd.h"
 
-using namespace dvl;
+using namespace devilution;
 
 // TilesInView
 
diff --git a/SourceT/stores_test.cpp b/SourceT/stores_test.cpp
index d70e98042..1f7c5ca22 100644
--- a/SourceT/stores_test.cpp
+++ b/SourceT/stores_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "all.h"
 
-using namespace dvl;
+using namespace devilution;
 
 namespace {
 
diff --git a/SourceT/writehero_test.cpp b/SourceT/writehero_test.cpp
index 121dbb6f2..4bd391fb7 100644
--- a/SourceT/writehero_test.cpp
+++ b/SourceT/writehero_test.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "paths.h"
 
-using namespace dvl;
+using namespace devilution;
 
 int spelldat_vanilla[] = {
 	0, 1, 1, 4, 5, -1, 3, 3, 6, -1, 7, 6, 8, 9,
diff --git a/SourceX/DiabloUI/art.cpp b/SourceX/DiabloUI/art.cpp
index 772340b2a..62622d78d 100644
--- a/SourceX/DiabloUI/art.cpp
+++ b/SourceX/DiabloUI/art.cpp
@@ -2,7 +2,7 @@
 #include "display.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 void LoadArt(const char *pszFile, Art *art, int frames, SDL_Color *pPalette)
 {
@@ -66,4 +66,4 @@ void LoadArt(Art *art, const BYTE *artData, int w, int h, int frames)
 	ScaleSurfaceToOutput(&art->surface);
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/art.h b/SourceX/DiabloUI/art.h
index d3b5ff9a0..bdb44200f 100644
--- a/SourceX/DiabloUI/art.h
+++ b/SourceX/DiabloUI/art.h
@@ -2,7 +2,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 struct Art {
 	SDL_Surface *surface;
diff --git a/SourceX/DiabloUI/art_draw.cpp b/SourceX/DiabloUI/art_draw.cpp
index 1ad89e45f..d3d4c58f2 100644
--- a/SourceX/DiabloUI/art_draw.cpp
+++ b/SourceX/DiabloUI/art_draw.cpp
@@ -3,7 +3,7 @@
 #include "DiabloUI/diabloui.h"
 #include "display.h"
 
-namespace dvl {
+namespace devilution {
 
 void DrawArt(Sint16 screenX, Sint16 screenY, Art *art, int nFrame, Uint16 srcW, Uint16 srcH)
 {
@@ -74,4 +74,4 @@ int GetAnimationFrame(int frames, int fps)
 	return frame > frames ? 0 : frame;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/art_draw.h b/SourceX/DiabloUI/art_draw.h
index 6feee5d4a..3e22fca3a 100644
--- a/SourceX/DiabloUI/art_draw.h
+++ b/SourceX/DiabloUI/art_draw.h
@@ -4,7 +4,7 @@
 
 #include "../SourceX/DiabloUI/art.h"
 
-namespace dvl {
+namespace devilution {
 
 void DrawArt(Sint16 screenX, Sint16 screenY, Art *art, int nFrame = 0, Uint16 srcW = 0, Uint16 srcH = 0);
 
diff --git a/SourceX/DiabloUI/button.cpp b/SourceX/DiabloUI/button.cpp
index 65b5d0f6f..ac17997e1 100644
--- a/SourceX/DiabloUI/button.cpp
+++ b/SourceX/DiabloUI/button.cpp
@@ -4,7 +4,7 @@
 #include "DiabloUI/errorart.h"
 #include "display.h"
 
-namespace dvl {
+namespace devilution {
 
 Art SmlButton;
 
@@ -54,4 +54,4 @@ void HandleGlobalMouseUpButton(UiButton *button)
 	button->m_pressed = false;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/button.h b/SourceX/DiabloUI/button.h
index 80b55c905..35b00dbf2 100644
--- a/SourceX/DiabloUI/button.h
+++ b/SourceX/DiabloUI/button.h
@@ -3,7 +3,7 @@
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"
 
-namespace dvl {
+namespace devilution {
 
 extern Art SmlButton;
 void LoadSmlButtonArt();
diff --git a/SourceX/DiabloUI/credits.cpp b/SourceX/DiabloUI/credits.cpp
index 34582551a..86348533e 100644
--- a/SourceX/DiabloUI/credits.cpp
+++ b/SourceX/DiabloUI/credits.cpp
@@ -13,7 +13,7 @@
 #include "DiabloUI/art_draw.h"
 #include "DiabloUI/fonts.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -261,4 +261,4 @@ BOOL UiSupportDialog()
 	return TextDialog();
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/credits_lines.cpp b/SourceX/DiabloUI/credits_lines.cpp
index 08c6b076c..4d96fd76d 100644
--- a/SourceX/DiabloUI/credits_lines.cpp
+++ b/SourceX/DiabloUI/credits_lines.cpp
@@ -1,6 +1,6 @@
 #include "DiabloUI/credits_lines.h"
 
-namespace dvl {
+namespace devilution {
 
 const char *const CREDITS_LINES[] = {
 	"Game Design",
@@ -553,4 +553,4 @@ const char *const CREDITS_LINES[] = {
 
 const std::size_t CREDITS_LINES_SIZE = sizeof(CREDITS_LINES) / sizeof(CREDITS_LINES[0]);
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/credits_lines.h b/SourceX/DiabloUI/credits_lines.h
index 5361d642b..a59fb807f 100644
--- a/SourceX/DiabloUI/credits_lines.h
+++ b/SourceX/DiabloUI/credits_lines.h
@@ -1,6 +1,6 @@
 #include <cstddef>
 
-namespace dvl {
+namespace devilution {
 
 extern const char *const CREDITS_LINES[];
 extern const std::size_t CREDITS_LINES_SIZE;
diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index fc2f57f21..e28d42ee5 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -22,7 +22,7 @@
 #include "platform/switch/keyboard.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 std::size_t SelectedItemMax;
 std::size_t ListViewportSize = 1;
@@ -928,4 +928,4 @@ void DrawMouse()
 
 	DrawArt(MouseX, MouseY, &ArtCursor);
 }
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/diabloui.h b/SourceX/DiabloUI/diabloui.h
index a0905170d..463ef86a9 100644
--- a/SourceX/DiabloUI/diabloui.h
+++ b/SourceX/DiabloUI/diabloui.h
@@ -8,7 +8,7 @@
 #include "DiabloUI/ui_item.h"
 #include "display.h"
 
-namespace dvl {
+namespace devilution {
 
 extern std::size_t SelectedItem;
 extern bool textInputActive;
diff --git a/SourceX/DiabloUI/dialogs.cpp b/SourceX/DiabloUI/dialogs.cpp
index 721701783..41b9809c9 100644
--- a/SourceX/DiabloUI/dialogs.cpp
+++ b/SourceX/DiabloUI/dialogs.cpp
@@ -9,7 +9,7 @@
 #include "DiabloUI/errorart.h"
 #include "display.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -296,4 +296,4 @@ void UiErrorOkDialog(const char *text, std::vector<UiItemBase *> renderBehind)
 	UiErrorOkDialog(text, NULL, renderBehind);
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/dialogs.h b/SourceX/DiabloUI/dialogs.h
index 1d3821a70..b8d32f20a 100644
--- a/SourceX/DiabloUI/dialogs.h
+++ b/SourceX/DiabloUI/dialogs.h
@@ -4,7 +4,7 @@
 
 #include "DiabloUI/ui_item.h"
 
-namespace dvl {
+namespace devilution {
 
 void UiErrorOkDialog(const char *text, std::vector<UiItemBase *> renderBehind);
 void UiErrorOkDialog(const char *text, const char *caption, std::vector<UiItemBase *> renderBehind);
diff --git a/SourceX/DiabloUI/errorart.cpp b/SourceX/DiabloUI/errorart.cpp
index 905d38fe5..70ebcd15b 100644
--- a/SourceX/DiabloUI/errorart.cpp
+++ b/SourceX/DiabloUI/errorart.cpp
@@ -1,6 +1,6 @@
 #include "DiabloUI/errorart.h"
 
-namespace dvl {
+namespace devilution {
 
 const unsigned char btnData[] = {
 	// clang-format off
@@ -348,4 +348,4 @@ const unsigned char popupData[] = {
 	// clang-format on
 };
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/errorart.h b/SourceX/DiabloUI/errorart.h
index 12882c810..efa7b2ba6 100644
--- a/SourceX/DiabloUI/errorart.h
+++ b/SourceX/DiabloUI/errorart.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 extern const unsigned char btnData[];
 extern const unsigned char popupData[];
diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp
index 178dcbe96..84bcda4c9 100644
--- a/SourceX/DiabloUI/fonts.cpp
+++ b/SourceX/DiabloUI/fonts.cpp
@@ -2,7 +2,7 @@
 #include "file_util.h"
 #include "../SourceS/paths.h"
 
-namespace dvl {
+namespace devilution {
 
 TTF_Font *font = NULL;
 BYTE *FontTables[4];
@@ -91,4 +91,4 @@ void FontsCleanup()
 	TTF_Quit();
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/fonts.h b/SourceX/DiabloUI/fonts.h
index c2adaf4a9..fde0a0995 100644
--- a/SourceX/DiabloUI/fonts.h
+++ b/SourceX/DiabloUI/fonts.h
@@ -6,7 +6,7 @@
 
 #include "DiabloUI/art.h"
 
-namespace dvl {
+namespace devilution {
 
 enum _artFontTables {
 	AFT_SMALL,
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp
index 48e9773f0..83867c3ce 100644
--- a/SourceX/DiabloUI/mainmenu.cpp
+++ b/SourceX/DiabloUI/mainmenu.cpp
@@ -2,7 +2,7 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/selok.h"
 
-namespace dvl {
+namespace devilution {
 
 int mainmenu_attract_time_out; //seconds
 DWORD dwAttractTicks;
@@ -115,4 +115,4 @@ BOOL UiMainMenuDialog(const char *name, int *pdwResult, void (*fnSound)(const ch
 	return true;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/progress.cpp b/SourceX/DiabloUI/progress.cpp
index da50467d4..a66258de3 100644
--- a/SourceX/DiabloUI/progress.cpp
+++ b/SourceX/DiabloUI/progress.cpp
@@ -7,7 +7,7 @@
 #include "DiabloUI/art_draw.h"
 #include "DiabloUI/fonts.h"
 
-namespace dvl {
+namespace devilution {
 
 Art dialogArt;
 char dialogText[256];
@@ -137,4 +137,4 @@ BOOL UiProgressDialog(const char *msg, int enable, int (*fnfunc)(), int rate)
 	return progress == 100;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/scrollbar.cpp b/SourceX/DiabloUI/scrollbar.cpp
index 97069983c..6f0702f51 100644
--- a/SourceX/DiabloUI/scrollbar.cpp
+++ b/SourceX/DiabloUI/scrollbar.cpp
@@ -1,6 +1,6 @@
 #include "scrollbar.h"
 
-namespace dvl {
+namespace devilution {
 
 Art ArtScrollBarBackground;
 Art ArtScrollBarThumb;
@@ -20,4 +20,4 @@ void UnloadScrollBar()
 	ArtScrollBarBackground.Unload();
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/scrollbar.h b/SourceX/DiabloUI/scrollbar.h
index 79ef92f12..29f5b9742 100644
--- a/SourceX/DiabloUI/scrollbar.h
+++ b/SourceX/DiabloUI/scrollbar.h
@@ -3,7 +3,7 @@
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"
 
-namespace dvl {
+namespace devilution {
 
 extern Art ArtScrollBarBackground;
 extern Art ArtScrollBarThumb;
diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp
index 4eceac6f2..ca3f3f19a 100644
--- a/SourceX/DiabloUI/selconn.cpp
+++ b/SourceX/DiabloUI/selconn.cpp
@@ -5,7 +5,7 @@
 #include "DiabloUI/text.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 
 char selconn_MaxPlayers[21];
 char selconn_Description[64];
@@ -142,4 +142,4 @@ int UiSelectProvider(GameData *gameData)
 	return selconn_ReturnValue;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/selconn.h b/SourceX/DiabloUI/selconn.h
index 063ca5232..01eaeb8dc 100644
--- a/SourceX/DiabloUI/selconn.h
+++ b/SourceX/DiabloUI/selconn.h
@@ -1,4 +1,4 @@
-namespace dvl {
+namespace devilution {
 
 void selconn_Esc();
 void selconn_Focus(int value);
diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp
index b487300a9..63c69709a 100644
--- a/SourceX/DiabloUI/selgame.cpp
+++ b/SourceX/DiabloUI/selgame.cpp
@@ -10,7 +10,7 @@
 #include "DiabloUI/selhero.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 char selgame_Label[32];
 char selgame_Ip[129] = "";
@@ -484,4 +484,4 @@ int UiSelectGame(GameData *gameData, int *playerId)
 
 	return selgame_enteringGame;
 }
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/selgame.h b/SourceX/DiabloUI/selgame.h
index 33725c45c..8033b60ef 100644
--- a/SourceX/DiabloUI/selgame.h
+++ b/SourceX/DiabloUI/selgame.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 extern int nDifficulty;
 
diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp
index 2ec5d5f36..cf692749e 100644
--- a/SourceX/DiabloUI/selhero.cpp
+++ b/SourceX/DiabloUI/selhero.cpp
@@ -18,7 +18,7 @@
 #include "../platform/ctr/keyboard.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 static const char *selhero_GenerateName(uint8_t hero_class);
 
@@ -654,4 +654,4 @@ static const char *selhero_GenerateName(uint8_t hero_class)
 	return kNames[hero_class % 6][iRand];
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/selhero.h b/SourceX/DiabloUI/selhero.h
index ad6584c1e..0d363950c 100644
--- a/SourceX/DiabloUI/selhero.h
+++ b/SourceX/DiabloUI/selhero.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace dvl {
+namespace devilution {
 
 extern bool selhero_isMultiPlayer;
 extern bool selhero_endMenu;
diff --git a/SourceX/DiabloUI/selok.cpp b/SourceX/DiabloUI/selok.cpp
index bcb64040b..ea2a40be7 100644
--- a/SourceX/DiabloUI/selok.cpp
+++ b/SourceX/DiabloUI/selok.cpp
@@ -3,7 +3,7 @@
 #include "DiabloUI/text.h"
 #include "DiabloUI/selok.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -89,4 +89,4 @@ void UiSelOkDialog(const char *title, const char *body, bool background)
 
 	selok_Free();
 }
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/selok.h b/SourceX/DiabloUI/selok.h
index a5f433b09..c7a424693 100644
--- a/SourceX/DiabloUI/selok.h
+++ b/SourceX/DiabloUI/selok.h
@@ -2,7 +2,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 void UiSelOkDialog(const char *title, const char *body, bool background);
 void selok_Free();
 void selok_Select(int value);
diff --git a/SourceX/DiabloUI/selyesno.cpp b/SourceX/DiabloUI/selyesno.cpp
index e9d1ab28a..6281c8815 100644
--- a/SourceX/DiabloUI/selyesno.cpp
+++ b/SourceX/DiabloUI/selyesno.cpp
@@ -4,7 +4,7 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
 
-namespace dvl {
+namespace devilution {
 
 bool selyesno_endMenu;
 bool selyesno_value;
@@ -78,4 +78,4 @@ bool UiSelHeroYesNoDialog(const char *title, const char *body)
 
 	return selyesno_value;
 }
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/selyesno.h b/SourceX/DiabloUI/selyesno.h
index 99d1d81c0..defbdb904 100644
--- a/SourceX/DiabloUI/selyesno.h
+++ b/SourceX/DiabloUI/selyesno.h
@@ -2,7 +2,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 bool UiSelHeroYesNoDialog(const char *title, const char *body);
 void selyesno_Free();
 void selyesno_Select(int value);
diff --git a/SourceX/DiabloUI/support_lines.cpp b/SourceX/DiabloUI/support_lines.cpp
index fbda5323d..a21dba38f 100644
--- a/SourceX/DiabloUI/support_lines.cpp
+++ b/SourceX/DiabloUI/support_lines.cpp
@@ -1,6 +1,6 @@
 #include "DiabloUI/support_lines.h"
 
-namespace dvl {
+namespace devilution {
 
 const char *const SUPPORT_LINES[] = {
 	"",
@@ -26,4 +26,4 @@ const char *const SUPPORT_LINES[] = {
 
 const std::size_t SUPPORT_LINES_SIZE = sizeof(SUPPORT_LINES) / sizeof(SUPPORT_LINES[0]);
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/support_lines.h b/SourceX/DiabloUI/support_lines.h
index 30a5f90ce..6fdd2ec95 100644
--- a/SourceX/DiabloUI/support_lines.h
+++ b/SourceX/DiabloUI/support_lines.h
@@ -1,6 +1,6 @@
 #include <cstddef>
 
-namespace dvl {
+namespace devilution {
 
 extern const char *const SUPPORT_LINES[];
 extern const std::size_t SUPPORT_LINES_SIZE;
diff --git a/SourceX/DiabloUI/text.cpp b/SourceX/DiabloUI/text.cpp
index 8b0993019..935e33fc4 100644
--- a/SourceX/DiabloUI/text.cpp
+++ b/SourceX/DiabloUI/text.cpp
@@ -1,6 +1,6 @@
 #include "DiabloUI/text.h"
 
-namespace dvl {
+namespace devilution {
 
 std::size_t GetArtStrWidth(const char *str, std::size_t size)
 {
@@ -57,4 +57,4 @@ void WordWrapArtStr(char *text, std::size_t width)
 	}
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/text.h b/SourceX/DiabloUI/text.h
index 85bed0d43..38030890a 100644
--- a/SourceX/DiabloUI/text.h
+++ b/SourceX/DiabloUI/text.h
@@ -4,7 +4,7 @@
 
 #include "DiabloUI/fonts.h"
 
-namespace dvl {
+namespace devilution {
 
 std::size_t GetArtStrWidth(const char *str, std::size_t size);
 void WordWrapArtStr(char *text, std::size_t width);
diff --git a/SourceX/DiabloUI/text_draw.cpp b/SourceX/DiabloUI/text_draw.cpp
index f22df9f32..ec734148e 100644
--- a/SourceX/DiabloUI/text_draw.cpp
+++ b/SourceX/DiabloUI/text_draw.cpp
@@ -8,7 +8,7 @@
 #include "DiabloUI/ttf_render_wrapped.h"
 #include "display.h"
 
-namespace dvl {
+namespace devilution {
 
 extern SDL_Surface *pal_surface;
 
@@ -99,4 +99,4 @@ void DrawArtStr(const char *text, const SDL_Rect &rect, int flags, bool drawText
 	}
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/text_draw.h b/SourceX/DiabloUI/text_draw.h
index 95e434a62..8dcaa7381 100644
--- a/SourceX/DiabloUI/text_draw.h
+++ b/SourceX/DiabloUI/text_draw.h
@@ -2,7 +2,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 struct TtfSurfaceCache {
 
diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp
index ad9197c2f..810522170 100644
--- a/SourceX/DiabloUI/title.cpp
+++ b/SourceX/DiabloUI/title.cpp
@@ -2,7 +2,7 @@
 #include "controls/menu_controls.h"
 #include "DiabloUI/diabloui.h"
 
-namespace dvl {
+namespace devilution {
 
 std::vector<UiItemBase *> vecTitleScreen;
 
@@ -76,4 +76,4 @@ void UiSetSpawned(BOOL bSpawned)
 	gbSpawned = bSpawned;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.cpp b/SourceX/DiabloUI/ttf_render_wrapped.cpp
index 16209c0ad..a6cc9105f 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.cpp
+++ b/SourceX/DiabloUI/ttf_render_wrapped.cpp
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstring>
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -174,4 +174,4 @@ SDL_Surface *RenderUTF8_Solid_Wrapped(TTF_Font *font, const char *text, SDL_Colo
 	return textbuf;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.h b/SourceX/DiabloUI/ttf_render_wrapped.h
index 3e2092364..3845d9f18 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.h
+++ b/SourceX/DiabloUI/ttf_render_wrapped.h
@@ -4,7 +4,7 @@
 
 #include <SDL_ttf.h>
 
-namespace dvl {
+namespace devilution {
 
 enum TextAlignment {
 	TextAlignment_BEGIN = 0,
diff --git a/SourceX/DiabloUI/ui_item.h b/SourceX/DiabloUI/ui_item.h
index c3c4a026e..40cb27295 100644
--- a/SourceX/DiabloUI/ui_item.h
+++ b/SourceX/DiabloUI/ui_item.h
@@ -11,7 +11,7 @@
 #include "DiabloUI/art.h"
 #include "DiabloUI/text_draw.h"
 
-namespace dvl {
+namespace devilution {
 
 enum UiType {
 	UI_TEXT,
diff --git a/SourceX/controls/axis_direction.cpp b/SourceX/controls/axis_direction.cpp
index 28d621073..8faab07de 100644
--- a/SourceX/controls/axis_direction.cpp
+++ b/SourceX/controls/axis_direction.cpp
@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-namespace dvl {
+namespace devilution {
 
 AxisDirection AxisDirectionRepeater::Get(AxisDirection axis_direction)
 {
@@ -52,4 +52,4 @@ AxisDirection AxisDirectionRepeater::Get(AxisDirection axis_direction)
 	return axis_direction;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/axis_direction.h b/SourceX/controls/axis_direction.h
index 861513beb..398e3a37d 100644
--- a/SourceX/controls/axis_direction.h
+++ b/SourceX/controls/axis_direction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 enum AxisDirectionX {
 	AxisDirectionX_NONE = 0,
diff --git a/SourceX/controls/controller.cpp b/SourceX/controls/controller.cpp
index e06a85c91..499af5ebb 100644
--- a/SourceX/controls/controller.cpp
+++ b/SourceX/controls/controller.cpp
@@ -6,7 +6,7 @@
 #include "controls/devices/joystick.h"
 #include "controls/devices/game_controller.h"
 
-namespace dvl {
+namespace devilution {
 
 ControllerButtonEvent ToControllerButtonEvent(const SDL_Event &event)
 {
@@ -81,4 +81,4 @@ bool HandleControllerAddedOrRemovedEvent(const SDL_Event &event)
 #endif
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/controller.h b/SourceX/controls/controller.h
index 6760f10f9..b56d67314 100644
--- a/SourceX/controls/controller.h
+++ b/SourceX/controls/controller.h
@@ -5,7 +5,7 @@
 #include "all.h"
 #include "./controller_buttons.h"
 
-namespace dvl {
+namespace devilution {
 
 struct ControllerButtonEvent {
 	ControllerButton button;
diff --git a/SourceX/controls/controller_buttons.h b/SourceX/controls/controller_buttons.h
index ed4363ee0..859645a96 100644
--- a/SourceX/controls/controller_buttons.h
+++ b/SourceX/controls/controller_buttons.h
@@ -1,7 +1,7 @@
 #pragma once
 // Unifies joystick, gamepad, and keyboard controller APIs.
 
-namespace dvl {
+namespace devilution {
 
 // NOTE: A, B, X, Y refer to physical positions on an XBox 360 controller.
 // A<->B and X<->Y are reversed on a Nintendo controller.
diff --git a/SourceX/controls/controller_motion.cpp b/SourceX/controls/controller_motion.cpp
index 01d50dc18..19272e4c3 100644
--- a/SourceX/controls/controller_motion.cpp
+++ b/SourceX/controls/controller_motion.cpp
@@ -9,7 +9,7 @@
 #include "controls/game_controls.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -169,4 +169,4 @@ AxisDirection GetLeftStickOrDpadDirection(bool allow_dpad)
 	return result;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/controller_motion.h b/SourceX/controls/controller_motion.h
index 482fc9a82..a046c0773 100644
--- a/SourceX/controls/controller_motion.h
+++ b/SourceX/controls/controller_motion.h
@@ -7,7 +7,7 @@
 #include "./axis_direction.h"
 #include "./controller.h"
 
-namespace dvl {
+namespace devilution {
 
 // Raw axis values.
 extern float leftStickXUnscaled, leftStickYUnscaled, rightStickXUnscaled, rightStickYUnscaled;
diff --git a/SourceX/controls/devices/game_controller.cpp b/SourceX/controls/devices/game_controller.cpp
index e35374cd5..805d31852 100644
--- a/SourceX/controls/devices/game_controller.cpp
+++ b/SourceX/controls/devices/game_controller.cpp
@@ -11,7 +11,7 @@
 // Defined in SourceX/controls/plctrls.cpp
 extern "C" bool sgbControllerActive;
 
-namespace dvl {
+namespace devilution {
 
 std::vector<GameController> *const GameController::controllers_ = new std::vector<GameController>;
 
@@ -221,5 +221,5 @@ bool GameController::IsPressedOnAnyController(ControllerButton button)
 	return false;
 }
 
-} // namespace dvl
+} // namespace devilution
 #endif
diff --git a/SourceX/controls/devices/game_controller.h b/SourceX/controls/devices/game_controller.h
index e41e7b5e9..7c9b21802 100644
--- a/SourceX/controls/devices/game_controller.h
+++ b/SourceX/controls/devices/game_controller.h
@@ -8,7 +8,7 @@
 #include "controls/controller_buttons.h"
 
 #ifndef USE_SDL1
-namespace dvl {
+namespace devilution {
 
 class GameController {
 	static std::vector<GameController> *const controllers_;
diff --git a/SourceX/controls/devices/joystick.cpp b/SourceX/controls/devices/joystick.cpp
index 752c80616..ac721919e 100644
--- a/SourceX/controls/devices/joystick.cpp
+++ b/SourceX/controls/devices/joystick.cpp
@@ -9,7 +9,7 @@
 // Defined in SourceX/controls/plctrls.cpp
 extern "C" bool sgbControllerActive;
 
-namespace dvl {
+namespace devilution {
 
 std::vector<Joystick> *const Joystick::joysticks_ = new std::vector<Joystick>;
 
@@ -335,4 +335,4 @@ bool Joystick::IsPressedOnAnyJoystick(ControllerButton button)
 	return false;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/devices/joystick.h b/SourceX/controls/devices/joystick.h
index b3393663d..b466e5737 100644
--- a/SourceX/controls/devices/joystick.h
+++ b/SourceX/controls/devices/joystick.h
@@ -12,7 +12,7 @@
 #include "controls/controller.h"
 #include "controls/controller_buttons.h"
 
-namespace dvl {
+namespace devilution {
 
 class Joystick {
 	static std::vector<Joystick> *const joysticks_;
diff --git a/SourceX/controls/devices/kbcontroller.cpp b/SourceX/controls/devices/kbcontroller.cpp
index 9969e7833..28dbd1f95 100644
--- a/SourceX/controls/devices/kbcontroller.cpp
+++ b/SourceX/controls/devices/kbcontroller.cpp
@@ -6,7 +6,7 @@
 #include "sdl_compat.h"
 #include "stubs.h"
 
-namespace dvl {
+namespace devilution {
 
 ControllerButton KbCtrlToControllerButton(const SDL_Event &event)
 {
diff --git a/SourceX/controls/devices/kbcontroller.h b/SourceX/controls/devices/kbcontroller.h
index 0c38fd9b3..5949d4874 100644
--- a/SourceX/controls/devices/kbcontroller.h
+++ b/SourceX/controls/devices/kbcontroller.h
@@ -9,7 +9,7 @@
 #include <SDL.h>
 #include "controls/controller_buttons.h"
 
-namespace dvl {
+namespace devilution {
 
 ControllerButton KbCtrlToControllerButton(const SDL_Event &event);
 
diff --git a/SourceX/controls/game_controls.cpp b/SourceX/controls/game_controls.cpp
index 90dd44ea2..dad17f9ae 100644
--- a/SourceX/controls/game_controls.cpp
+++ b/SourceX/controls/game_controls.cpp
@@ -11,7 +11,7 @@
 #include "controls/plrctrls.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 bool start_modifier_active = false;
 bool select_modifier_active = false;
@@ -349,4 +349,4 @@ AxisDirection GetMoveDirection()
 	return GetLeftStickOrDpadDirection(/*allow_dpad=*/!sgOptions.Controller.bDpadHotkeys);
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/game_controls.h b/SourceX/controls/game_controls.h
index 13eb7dac9..0e15870ca 100644
--- a/SourceX/controls/game_controls.h
+++ b/SourceX/controls/game_controls.h
@@ -6,7 +6,7 @@
 #include "./axis_direction.h"
 #include "./controller.h"
 
-namespace dvl {
+namespace devilution {
 
 enum GameActionType {
 	GameActionType_NONE = 0,
diff --git a/SourceX/controls/menu_controls.cpp b/SourceX/controls/menu_controls.cpp
index 026d5367a..3134e6ed4 100644
--- a/SourceX/controls/menu_controls.cpp
+++ b/SourceX/controls/menu_controls.cpp
@@ -6,7 +6,7 @@
 #include "controls/remap_keyboard.h"
 #include "DiabloUI/diabloui.h"
 
-namespace dvl {
+namespace devilution {
 
 MenuAction GetMenuHeldUpDownAction()
 {
@@ -114,4 +114,4 @@ MenuAction GetMenuAction(const SDL_Event &event)
 	return MenuAction_NONE;
 } // namespace dvl
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/menu_controls.h b/SourceX/controls/menu_controls.h
index 08be9d519..1676a4261 100644
--- a/SourceX/controls/menu_controls.h
+++ b/SourceX/controls/menu_controls.h
@@ -2,7 +2,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 enum MenuAction {
 	MenuAction_NONE = 0,
diff --git a/SourceX/controls/modifier_hints.cpp b/SourceX/controls/modifier_hints.cpp
index e1414e003..b5d7ecdcb 100644
--- a/SourceX/controls/modifier_hints.cpp
+++ b/SourceX/controls/modifier_hints.cpp
@@ -7,7 +7,7 @@
 #include "controls/game_controls.h"
 #include "options.h"
 
-namespace dvl {
+namespace devilution {
 
 namespace {
 
@@ -139,4 +139,4 @@ void DrawControllerModifierHints(CelOutputBuffer out)
 	DrawSelectModifierMenu(out);
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/modifier_hints.h b/SourceX/controls/modifier_hints.h
index eab367e0a..f496b08d6 100644
--- a/SourceX/controls/modifier_hints.h
+++ b/SourceX/controls/modifier_hints.h
@@ -2,7 +2,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 void DrawControllerModifierHints(CelOutputBuffer out);
 
diff --git a/SourceX/controls/plrctrls.cpp b/SourceX/controls/plrctrls.cpp
index 969fc1ac1..413ec4d34 100644
--- a/SourceX/controls/plrctrls.cpp
+++ b/SourceX/controls/plrctrls.cpp
@@ -10,7 +10,7 @@
 
 #define SPLICONLENGTH 56
 
-namespace dvl {
+namespace devilution {
 
 bool sgbControllerActive = false;
 coords speedspellscoords[50];
@@ -842,7 +842,7 @@ void StoreMove(AxisDirection move_dir)
 		STextDown();
 }
 
-typedef void (*HandleLeftStickOrDPadFn)(dvl::AxisDirection);
+typedef void (*HandleLeftStickOrDPadFn)(devilution::AxisDirection);
 
 HandleLeftStickOrDPadFn GetLeftStickOrDPadGameUIHandler()
 {
@@ -1250,4 +1250,4 @@ void PerformSecondaryAction()
 	}
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/controls/plrctrls.h b/SourceX/controls/plrctrls.h
index 61691d104..68baf2d9f 100644
--- a/SourceX/controls/plrctrls.h
+++ b/SourceX/controls/plrctrls.h
@@ -3,7 +3,7 @@
 
 #include "all.h"
 
-namespace dvl {
+namespace devilution {
 
 typedef enum belt_item_type {
 	BLT_HEALING,
diff --git a/SourceX/controls/remap_keyboard.h b/SourceX/controls/remap_keyboard.h
index 5ddd7a3e1..6fe528379 100644
--- a/SourceX/controls/remap_keyboard.h
+++ b/SourceX/controls/remap_keyboard.h
@@ -8,7 +8,7 @@
 #include "sdl2_to_1_2_backports.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 
 // Re-maps a keyboard key as per the REMAP_KEYBOARD_KEYS define.
 inline void remap_keyboard_key(SDL_Keycode *sym)
diff --git a/SourceX/controls/touch.cpp b/SourceX/controls/touch.cpp
index 43667f265..b98a50790 100644
--- a/SourceX/controls/touch.cpp
+++ b/SourceX/controls/touch.cpp
@@ -86,7 +86,7 @@ static void init_touch(void)
 	SDL_DisplayMode current;
 	SDL_GetCurrentDisplayMode(0, &current);
 	visible_height = current.h;
-	visible_width = (current.h * dvl::gnScreenWidth) / dvl::gnScreenHeight;
+	visible_width = (current.h * devilution::gnScreenWidth) / devilution::gnScreenHeight;
 	x_borderwidth = (current.w - visible_width) / 2;
 	y_borderwidth = (current.h - visible_height) / 2;
 }
@@ -107,7 +107,7 @@ static void preprocess_events(SDL_Event *event)
 	SDL_TouchID port = event->tfinger.touchId;
 	if (port != 0) {
 #ifdef __vita__
-		if (dvl::sgOptions.Controller.bRearTouch) {
+		if (devilution::sgOptions.Controller.bRearTouch) {
 			switch (event->type) {
 			case SDL_FINGERDOWN:
 				preprocess_back_finger_down(event);
@@ -147,7 +147,7 @@ static void preprocess_finger_down(SDL_Event *event)
 	if (direct_touch) {
 		x = event->tfinger.x * visible_width + x_borderwidth;
 		y = event->tfinger.y * visible_height + y_borderwidth;
-		dvl::OutputToLogical(&x, &y);
+		devilution::OutputToLogical(&x, &y);
 	}
 
 	// make sure each finger is not reported down multiple times
@@ -245,8 +245,8 @@ static void preprocess_finger_up(SDL_Event *event)
 
 			// short (<MAX_TAP_TIME ms) tap is interpreted as right/left mouse click depending on # fingers already down
 			// but only if the finger hasn't moved since it was pressed down by more than MAX_TAP_MOTION_DISTANCE pixels
-			float xrel = ((event->tfinger.x * dvl::GetOutputSurface()->w) - (finger[port][i].last_down_x * dvl::GetOutputSurface()->w));
-			float yrel = ((event->tfinger.y * dvl::GetOutputSurface()->h) - (finger[port][i].last_down_y * dvl::GetOutputSurface()->h));
+			float xrel = ((event->tfinger.x * devilution::GetOutputSurface()->w) - (finger[port][i].last_down_x * devilution::GetOutputSurface()->w));
+			float yrel = ((event->tfinger.y * devilution::GetOutputSurface()->h) - (finger[port][i].last_down_y * devilution::GetOutputSurface()->h));
 			float max_r_squared = (float)(MAX_TAP_MOTION_DISTANCE * MAX_TAP_MOTION_DISTANCE);
 			if ((xrel * xrel + yrel * yrel) >= max_r_squared) {
 				continue;
@@ -268,7 +268,7 @@ static void preprocess_finger_up(SDL_Event *event)
 				if (direct_touch) {
 					x = event->tfinger.x * visible_width + x_borderwidth;
 					y = event->tfinger.y * visible_height + y_borderwidth;
-					dvl::OutputToLogical(&x, &y);
+					devilution::OutputToLogical(&x, &y);
 				}
 			}
 			set_mouse_button_event(event, SDL_MOUSEBUTTONDOWN, simulated_button, x, y);
@@ -314,19 +314,19 @@ static void preprocess_finger_motion(SDL_Event *event)
 		if (direct_touch) {
 			x = event->tfinger.x * visible_width + x_borderwidth;
 			y = event->tfinger.y * visible_height + y_borderwidth;
-			dvl::OutputToLogical(&x, &y);
+			devilution::OutputToLogical(&x, &y);
 		} else {
 			// for relative mode, use the pointer speed setting
 			float speedFactor = 1.0;
 
 			// convert touch events to relative mouse pointer events
 			// Whenever an SDL_event involving the mouse is processed,
-			x = (mouse_x + (event->tfinger.dx * 1.25 * speedFactor * dvl::GetOutputSurface()->w));
-			y = (mouse_y + (event->tfinger.dy * 1.25 * speedFactor * dvl::GetOutputSurface()->h));
+			x = (mouse_x + (event->tfinger.dx * 1.25 * speedFactor * devilution::GetOutputSurface()->w));
+			y = (mouse_y + (event->tfinger.dy * 1.25 * speedFactor * devilution::GetOutputSurface()->h));
 		}
 
-		x = clip(x, 0, dvl::GetOutputSurface()->w);
-		y = clip(y, 0, dvl::GetOutputSurface()->h);
+		x = clip(x, 0, devilution::GetOutputSurface()->w);
+		y = clip(y, 0, devilution::GetOutputSurface()->h);
 		xrel = x - mouse_x;
 		yrel = y - mouse_y;
 
@@ -414,7 +414,7 @@ static void preprocess_finger_motion(SDL_Event *event)
 	}
 }
 
-namespace dvl {
+namespace devilution {
 
 void handle_touch(SDL_Event *event, int current_mouse_x, int current_mouse_y)
 {
@@ -463,7 +463,7 @@ void finish_simulated_mouse_clicks(int current_mouse_x, int current_mouse_y)
 	}
 }
 
-} // namespace dvl
+} // namespace devilution
 
 static void set_mouse_button_event(SDL_Event *event, uint32_t type, uint8_t button, int32_t x, int32_t y)
 {
diff --git a/SourceX/controls/touch.h b/SourceX/controls/touch.h
index c3a07add9..c608a9c17 100644
--- a/SourceX/controls/touch.h
+++ b/SourceX/controls/touch.h
@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-namespace dvl {
+namespace devilution {
 
 #ifndef USE_SDL1
 void handle_touch(SDL_Event *event, int current_mouse_x, int current_mouse_y);
diff --git a/SourceX/display.cpp b/SourceX/display.cpp
index 3d39f78ba..288aa0de3 100644
--- a/SourceX/display.cpp
+++ b/SourceX/display.cpp
@@ -20,7 +20,7 @@
 #endif
 #endif
 
-namespace dvl {
+namespace devilution {
 
 extern SDL_Surface *renderer_texture_surface; /** defined in dx.cpp */
 
diff --git a/SourceX/display.h b/SourceX/display.h
index bec2914fd..8f7336fe2 100644
--- a/SourceX/display.h
+++ b/SourceX/display.h
@@ -6,7 +6,7 @@
 #include <SDL.h>
 #include <type_traits>
 
-namespace dvl {
+namespace devilution {
 
 extern int refreshDelay; // Screen refresh rate in nanoseconds
 extern SDL_Window *window;
diff --git a/SourceX/dvlnet/abstract_net.cpp b/SourceX/dvlnet/abstract_net.cpp
index f51ec2928..094b84bb8 100644
--- a/SourceX/dvlnet/abstract_net.cpp
+++ b/SourceX/dvlnet/abstract_net.cpp
@@ -8,7 +8,7 @@
 #endif
 #include "dvlnet/loopback.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 std::unique_ptr<abstract_net> abstract_net::make_net(provider_t provider)
@@ -32,4 +32,4 @@ std::unique_ptr<abstract_net> abstract_net::make_net(provider_t provider)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/abstract_net.h b/SourceX/dvlnet/abstract_net.h
index c482ed320..8b0593424 100644
--- a/SourceX/dvlnet/abstract_net.h
+++ b/SourceX/dvlnet/abstract_net.h
@@ -8,7 +8,7 @@
 #include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 typedef std::vector<unsigned char> buffer_t;
diff --git a/SourceX/dvlnet/base.cpp b/SourceX/dvlnet/base.cpp
index c2103e5f9..e7196b167 100644
--- a/SourceX/dvlnet/base.cpp
+++ b/SourceX/dvlnet/base.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cstring>
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 void base::setup_gameinfo(buffer_t info)
@@ -255,4 +255,4 @@ bool base::SNetGetTurnsInTransit(DWORD *turns)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/base.h b/SourceX/dvlnet/base.h
index ed0140c16..fb12b4b44 100644
--- a/SourceX/dvlnet/base.h
+++ b/SourceX/dvlnet/base.h
@@ -10,7 +10,7 @@
 #include "dvlnet/abstract_net.h"
 #include "dvlnet/packet.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class base : public abstract_net {
diff --git a/SourceX/dvlnet/cdwrap.h b/SourceX/dvlnet/cdwrap.h
index 66cc5b444..a7069084b 100644
--- a/SourceX/dvlnet/cdwrap.h
+++ b/SourceX/dvlnet/cdwrap.h
@@ -10,7 +10,7 @@
 
 #include "dvlnet/abstract_net.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 template <class T>
diff --git a/SourceX/dvlnet/frame_queue.cpp b/SourceX/dvlnet/frame_queue.cpp
index 34d6be821..f27088343 100644
--- a/SourceX/dvlnet/frame_queue.cpp
+++ b/SourceX/dvlnet/frame_queue.cpp
@@ -4,7 +4,7 @@
 
 #include "dvlnet/packet.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 framesize_t frame_queue::size()
@@ -79,4 +79,4 @@ buffer_t frame_queue::make_frame(buffer_t packetbuf)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/frame_queue.h b/SourceX/dvlnet/frame_queue.h
index 8e48bfa8b..38c993b78 100644
--- a/SourceX/dvlnet/frame_queue.h
+++ b/SourceX/dvlnet/frame_queue.h
@@ -4,7 +4,7 @@
 
 #include "dvlnet/abstract_net.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class frame_queue_exception : public dvlnet_exception {
diff --git a/SourceX/dvlnet/loopback.cpp b/SourceX/dvlnet/loopback.cpp
index 02ef79121..4b33f6a07 100644
--- a/SourceX/dvlnet/loopback.cpp
+++ b/SourceX/dvlnet/loopback.cpp
@@ -1,7 +1,7 @@
 #include "dvlnet/loopback.h"
 #include "stubs.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 int loopback::create(std::string addrstr, std::string passwd)
@@ -106,4 +106,4 @@ bool loopback::SNetGetTurnsInTransit(DWORD *turns)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/loopback.h b/SourceX/dvlnet/loopback.h
index 6797b9ecc..bd8e7a2a4 100644
--- a/SourceX/dvlnet/loopback.h
+++ b/SourceX/dvlnet/loopback.h
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "dvlnet/abstract_net.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class loopback : public abstract_net {
diff --git a/SourceX/dvlnet/packet.cpp b/SourceX/dvlnet/packet.cpp
index 1521f3087..029855b09 100644
--- a/SourceX/dvlnet/packet.cpp
+++ b/SourceX/dvlnet/packet.cpp
@@ -1,6 +1,6 @@
 #include "dvlnet/packet.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 #ifndef NONET
@@ -231,4 +231,4 @@ packet_factory::packet_factory(std::string pw)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/packet.h b/SourceX/dvlnet/packet.h
index 0d8d62c69..ccaf07c39 100644
--- a/SourceX/dvlnet/packet.h
+++ b/SourceX/dvlnet/packet.h
@@ -11,7 +11,7 @@
 #include "dvlnet/abstract_net.h"
 #include "stubs.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 enum packet_type : uint8_t {
diff --git a/SourceX/dvlnet/tcp_client.cpp b/SourceX/dvlnet/tcp_client.cpp
index a4e823e60..b4b48e41f 100644
--- a/SourceX/dvlnet/tcp_client.cpp
+++ b/SourceX/dvlnet/tcp_client.cpp
@@ -11,7 +11,7 @@
 
 #include <asio/connect.hpp>
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 int tcp_client::create(std::string addrstr, std::string passwd)
@@ -132,4 +132,4 @@ tcp_client::~tcp_client()
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/tcp_client.h b/SourceX/dvlnet/tcp_client.h
index ee86bc1bb..7382fbfdc 100644
--- a/SourceX/dvlnet/tcp_client.h
+++ b/SourceX/dvlnet/tcp_client.h
@@ -12,7 +12,7 @@
 #include "dvlnet/base.h"
 #include "dvlnet/tcp_server.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class tcp_client : public base {
diff --git a/SourceX/dvlnet/tcp_server.cpp b/SourceX/dvlnet/tcp_server.cpp
index 85c6d0d73..64f501a41 100644
--- a/SourceX/dvlnet/tcp_server.cpp
+++ b/SourceX/dvlnet/tcp_server.cpp
@@ -5,7 +5,7 @@
 
 #include "dvlnet/base.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 tcp_server::tcp_server(asio::io_context &ioc, std::string bindaddr,
@@ -223,4 +223,4 @@ tcp_server::~tcp_server()
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/tcp_server.h b/SourceX/dvlnet/tcp_server.h
index e4704c35f..8617a0d3e 100644
--- a/SourceX/dvlnet/tcp_server.h
+++ b/SourceX/dvlnet/tcp_server.h
@@ -12,7 +12,7 @@
 #include "dvlnet/abstract_net.h"
 #include "dvlnet/frame_queue.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class server_exception : public dvlnet_exception {
diff --git a/SourceX/dvlnet/udp_p2p.cpp b/SourceX/dvlnet/udp_p2p.cpp
index 4d7992a0b..257e2dc80 100644
--- a/SourceX/dvlnet/udp_p2p.cpp
+++ b/SourceX/dvlnet/udp_p2p.cpp
@@ -7,7 +7,7 @@
 #include "sdl2_to_1_2_backports.h"
 #endif
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 const udp_p2p::endpoint udp_p2p::none;
@@ -168,4 +168,4 @@ void udp_p2p::recv_decrypted(packet &pkt, endpoint sender)
 }
 
 } // namespace net
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/dvlnet/udp_p2p.h b/SourceX/dvlnet/udp_p2p.h
index 663aa6901..93d96c275 100644
--- a/SourceX/dvlnet/udp_p2p.h
+++ b/SourceX/dvlnet/udp_p2p.h
@@ -10,7 +10,7 @@
 #include "dvlnet/packet.h"
 #include "dvlnet/base.h"
 
-namespace dvl {
+namespace devilution {
 namespace net {
 
 class udp_p2p : public base {
diff --git a/SourceX/dx.cpp b/SourceX/dx.cpp
index 9dbce9811..400314b96 100644
--- a/SourceX/dx.cpp
+++ b/SourceX/dx.cpp
@@ -13,7 +13,7 @@
 #include <3ds.h>
 #endif
 
-namespace dvl {
+namespace devilution {
 
 int sgdwLockCount;
 #ifdef _DEBUG
diff --git a/SourceX/main.cpp b/SourceX/main.cpp
index ca355de18..2dfb50cfe 100644
--- a/SourceX/main.cpp
+++ b/SourceX/main.cpp
@@ -31,5 +31,5 @@ int main(int argc, char **argv)
 	ctr_sys_init();
 #endif
 
-	return dvl::DiabloMain(argc, argv);
+	return devilution::DiabloMain(argc, argv);
 }
diff --git a/SourceX/miniwin/misc_msg.cpp b/SourceX/miniwin/misc_msg.cpp
index 2786efb28..50b2808b3 100644
--- a/SourceX/miniwin/misc_msg.cpp
+++ b/SourceX/miniwin/misc_msg.cpp
@@ -23,7 +23,7 @@
  * Windows message handling and keyboard event conversion for SDL.
  */
 
-namespace dvl {
+namespace devilution {
 
 static std::deque<MSG> message_queue;
 
@@ -733,4 +733,4 @@ bool PostMessage(UINT Msg, WPARAM wParam, LPARAM lParam)
 	return true;
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/platform/switch/docking.cpp b/SourceX/platform/switch/docking.cpp
index dc35c3928..a8dec1a6c 100644
--- a/SourceX/platform/switch/docking.cpp
+++ b/SourceX/platform/switch/docking.cpp
@@ -3,7 +3,7 @@
 #include "display.h"
 #include "platform/switch/docking.h"
 
-namespace dvl {
+namespace devilution {
 
 static int currently_docked = -1; // keep track of docked or handheld mode
 
diff --git a/SourceX/platform/switch/docking.h b/SourceX/platform/switch/docking.h
index 5a81a1e24..4a0da4ac4 100644
--- a/SourceX/platform/switch/docking.h
+++ b/SourceX/platform/switch/docking.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace dvl {
+namespace devilution {
 
 void HandleDocking();
 
diff --git a/SourceX/qol.cpp b/SourceX/qol.cpp
index ec5aa7d15..8c3b4a54f 100644
--- a/SourceX/qol.cpp
+++ b/SourceX/qol.cpp
@@ -7,7 +7,7 @@
 #include "options.h"
 #include "DiabloUI/art_draw.h"
 
-namespace dvl {
+namespace devilution {
 namespace {
 
 struct QolArt {
diff --git a/SourceX/qol.h b/SourceX/qol.h
index 8aa46b688..679016612 100644
--- a/SourceX/qol.h
+++ b/SourceX/qol.h
@@ -8,7 +8,7 @@
 
 #include "engine.h"
 
-namespace dvl {
+namespace devilution {
 
 void FreeQol();
 void InitQol();
diff --git a/SourceX/sound.cpp b/SourceX/sound.cpp
index 4fabd98d6..6c03c2466 100644
--- a/SourceX/sound.cpp
+++ b/SourceX/sound.cpp
@@ -11,7 +11,7 @@
 #include <SDL.h>
 #include <SDL_mixer.h>
 
-namespace dvl {
+namespace devilution {
 
 BOOLEAN gbSndInited;
 /** Specifies whether background music is enabled. */
diff --git a/SourceX/soundsample.cpp b/SourceX/soundsample.cpp
index cf356b14b..47671c5b7 100644
--- a/SourceX/soundsample.cpp
+++ b/SourceX/soundsample.cpp
@@ -4,7 +4,7 @@
 
 #include "storm_sdl_rw.h"
 
-namespace dvl {
+namespace devilution {
 
 ///// SoundSample /////
 
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index 7abd1e722..12035116d 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -21,7 +21,7 @@
 
 #include "DiabloUI/diabloui.h"
 
-namespace dvl {
+namespace devilution {
 
 DWORD nLastError = 0;
 
@@ -800,4 +800,4 @@ BOOL SFileEnableDirectAccess(BOOL enable)
 	directFileAccess = enable;
 	return true;
 }
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/storm/storm_net.cpp b/SourceX/storm/storm_net.cpp
index 04908be3e..1179373c7 100644
--- a/SourceX/storm/storm_net.cpp
+++ b/SourceX/storm/storm_net.cpp
@@ -5,7 +5,7 @@
 #include "stubs.h"
 #include "dvlnet/abstract_net.h"
 
-namespace dvl {
+namespace devilution {
 
 static std::unique_ptr<net::abstract_net> dvlnet_inst;
 static char gpszGameName[128] = {};
@@ -158,4 +158,4 @@ BOOL SNetPerformUpgrade(DWORD *upgradestatus)
 	UNIMPLEMENTED();
 }
 
-} // namespace dvl
+} // namespace devilution
diff --git a/SourceX/storm_sdl_rw.cpp b/SourceX/storm_sdl_rw.cpp
index 0a038d258..5777888e5 100644
--- a/SourceX/storm_sdl_rw.cpp
+++ b/SourceX/storm_sdl_rw.cpp
@@ -7,7 +7,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../Source/engine.h"
 
-namespace dvl {
+namespace devilution {
 
 static HANDLE SFileRw_GetHandle(struct SDL_RWops *context)
 {
diff --git a/SourceX/storm_sdl_rw.h b/SourceX/storm_sdl_rw.h
index 22e8857f1..70ca68a8a 100644
--- a/SourceX/storm_sdl_rw.h
+++ b/SourceX/storm_sdl_rw.h
@@ -4,7 +4,7 @@
 
 #include "../SourceS/miniwin/misc.h"
 
-namespace dvl {
+namespace devilution {
 
 /**
  * @brief Creates a read-only SDL_RWops from a Storm file handle.
diff --git a/SourceX/thread.cpp b/SourceX/thread.cpp
index 2b536a39c..a915a01b6 100644
--- a/SourceX/thread.cpp
+++ b/SourceX/thread.cpp
@@ -3,7 +3,7 @@
 #include <SDL.h>
 #include <set>
 
-namespace dvl {
+namespace devilution {
 
 static int SDLCALL thread_translate(void *ptr)
 {
diff --git a/defs.h b/defs.h
index 3c151011f..a817f9948 100644
--- a/defs.h
+++ b/defs.h
@@ -124,7 +124,7 @@
 
 #define BUFFER_BORDER_LEFT		64
 #define BUFFER_BORDER_TOP		160
-#define BUFFER_BORDER_RIGHT	dvl::borderRight
+#define BUFFER_BORDER_RIGHT	devilution::borderRight
 #define BUFFER_BORDER_BOTTOM	16
 
 #define UI_OFFSET_Y		((Sint16)((gnScreenHeight - 480) / 2))
diff --git a/enums.h b/enums.h
index e637b2a76..ce6b42935 100644
--- a/enums.h
+++ b/enums.h
@@ -4,7 +4,7 @@
  * Various global enumerators.
  */
 
-namespace dvl {
+namespace devilution {
 
 typedef enum _sfx_id {
 	PS_WALK1,