diff --git a/docs/development/licenses.md b/docs/development/licenses.md
index 5cf41f47e..bfe313d9d 100644
--- a/docs/development/licenses.md
+++ b/docs/development/licenses.md
@@ -94,7 +94,7 @@ See below for a summary of the licenses behind RetroArch and its cores:
| Dolphin | [GPLv2](https://github.com/dolphin-emu/dolphin/blob/master/license.txt) | |
| DOSBox | [GPLv2](https://github.com/libretro/dosbox-libretro/blob/master/COPYING) | |
| DOSBox Pure | [GPLv2](https://github.com/libretro/dosbox-libretro/blob/master/COPYING) | |
-| [Doukutsu Rust](../library/doukutsu-rust.md) | [MIT](https://github.com/DrGlaucous/doukutsu-rs-nm/blob/retroarch-dev/LICENSE) | |
+| [doukutsu-rs](../library/doukutsu-rs.md) | [MIT](https://github.com/DrGlaucous/doukutsu-rs-nm/blob/retroarch-dev/LICENSE) | |
| Dummy Core | [MIT](https://github.com/libretro/libretro-samples/blob/master/license) | |
| Dungeon Crawl Stone Soup | [GPLv2+](https://github.com/libretro/crawl-ref/blob/master/crawl-ref/licence.txt) | |
| EasyRPG | [GPLv3](https://github.com/libretro/easyrpg-libretro/blob/master/COPYING) | |
diff --git a/docs/guides/core-list.md b/docs/guides/core-list.md
index 5fc3db7b5..fe9637830 100644
--- a/docs/guides/core-list.md
+++ b/docs/guides/core-list.md
@@ -57,7 +57,7 @@
| DOSBox-core | DOS | Provides some improvements over the DOSBox-SVN trunk, including native MIDI support, cycle-accurate OPL3 (YMF262) emulation, MT-32 emulation and experimental 3dfx Voodoo support |
| DOSBox-Pure | DOS | A port of DOSBox with a goal of simplicty and ease of use and gameplay. This core includes a streamlined workflow for launching games directly from ZIP archives with automated mapping of controls to gamepads and a native onscreen keyboard. |
| DOSBox-SVN | DOS | This core is based on DOSBox-SVN trunk and allows on-the-fly configuration and different sync methods |
-| [Doukutsu Rust](../library/doukutsu-rust.md) | Game engine | An open-source reimplementation of the Cave Story engine compatible with all official (and some unofficial) releases of Cave Story |
+| [doukutsu-rs](../library/doukutsu-rs.md) | Game engine | An open-source reimplementation of the Cave Story engine compatible with all official (and some unofficial) releases of Cave Story |
| DuckStation | Sony PlayStation | |
| Dungeon Crawl Stone Soup | Game | A preliminary port of the Dungeon Crawl Stone Soup strategy game |
| EasyRPG | RPG Maker 2000/2003 | |
diff --git a/docs/image/core/doukutsu-rust/drs-libretro.png b/docs/image/core/doukutsu-rs/drs-libretro.png
similarity index 100%
rename from docs/image/core/doukutsu-rust/drs-libretro.png
rename to docs/image/core/doukutsu-rs/drs-libretro.png
diff --git a/docs/image/core/doukutsu-rust/dummy-target.png b/docs/image/core/doukutsu-rs/dummy-target.png
similarity index 100%
rename from docs/image/core/doukutsu-rust/dummy-target.png
rename to docs/image/core/doukutsu-rs/dummy-target.png
diff --git a/docs/image/core/doukutsu-rust/more-rust.png b/docs/image/core/doukutsu-rs/more-rust.png
similarity index 100%
rename from docs/image/core/doukutsu-rust/more-rust.png
rename to docs/image/core/doukutsu-rs/more-rust.png
diff --git a/docs/library/doukutsu-rust.md b/docs/library/doukutsu-rs.md
similarity index 95%
rename from docs/library/doukutsu-rust.md
rename to docs/library/doukutsu-rs.md
index 4a38306ff..fa2609009 100644
--- a/docs/library/doukutsu-rust.md
+++ b/docs/library/doukutsu-rs.md
@@ -1,12 +1,12 @@
-# Doukutsu Rust
+# doukutsu-rs
*This article primarily outlines the retroarch-specific features of this core. For a general feature-list and how-to for d-rs, please see the readme in the [Upstream Repository](https://github.com/doukutsu-rs/doukutsu-rs/).*
- 
+ 
## Background
-Doukutsu Rust *(often abbreviated d-rs)* is a modern and accurate re-implementation of the Cave Story Engine designed to be a drop-in replacement for all official and most fan ports, including:
+Doukutsu-rs *(often abbreviated d-rs)* is a modern and accurate re-implementation of the Cave Story Engine designed to be a drop-in replacement for all official and most fan ports, including:
- CS Freeware
- Cave Story+
@@ -60,7 +60,7 @@ The game should begin playing.
These versions of Cave Story don't have an executable bundled with the `data` folder. D-rs can load this just fine, but it needs to know *where* to find it, which requires the creation of a "dummy" executable next to the data folder.
- 
+ 
1. Grab your CS-Switch or CS-Wiiware install and place it where you can navigate to it from retroarch.
2. In the folder that contains the `data` folder *(not INSIDE the data folder, but next to it)*, create an empty file with the `.exe` extension. Name doesn't matter, (example: `Target.exe`)
@@ -146,7 +146,7 @@ Depending on the `Core Options` (see below), the game's screen ratio can be chan
- **GOD Mode (Invincibility)** - Player cannot take damage. `Disabled|Enabled`
- **Infinite Booster** - Gives the player the jetpack without a fuel limit. `Disabled|Enabled`
- **Noclip** - Allows the player to float through the map without tile or NPC collision. `Disabled|Enabled`
-- **More Rust** - Turns Sue into the d-rs mascot ({ width="16" height="16" }). `Disabled|Enabled`
+- **More Rust** - Turns Sue into the d-rs mascot ({ width="16" height="16" }). `Disabled|Enabled`
## User 1-2 device types
@@ -197,4 +197,4 @@ Rumble can also be disabled within the core's settings menu.
## (Related cores)
-- [NXEngine](nxengine.md)
\ No newline at end of file
+- [NXEngine](nxengine.md)
diff --git a/docs/library/nxengine.md b/docs/library/nxengine.md
index a78b28622..4a43661e1 100644
--- a/docs/library/nxengine.md
+++ b/docs/library/nxengine.md
@@ -133,4 +133,4 @@ The NXEngine core supports the following device type(s) in the controls menu, bo
## (Related cores)
-- [Doukutsu Rust](doukutsu-rust.md)
\ No newline at end of file
+- [doukutsu-rs](doukutsu-rs.md)
\ No newline at end of file
diff --git a/docs/meta/see-also.md b/docs/meta/see-also.md
index c340be304..bdf597abc 100644
--- a/docs/meta/see-also.md
+++ b/docs/meta/see-also.md
@@ -173,5 +173,5 @@ This is a list of cores that are related to each other in some way.
## Cave Story
-- [D-RS](../library/doukutsu-rust.md)
+- [d-rs](../library/doukutsu-rs.md)
- [NXEngine](../library/nxengine.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index e08578e69..087f8042a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -275,7 +275,7 @@ nav:
- '2048': 'library/2048.md'
- '3D Engine': 'library/3d_engine.md'
- 'Anarch': 'library/anarch.md'
- - 'Cave Story (Doukutsu Rust)': 'library/doukutsu-rust.md'
+ - 'Cave Story (doukutsu-rs)': 'library/doukutsu-rs.md'
- 'Cave Story (NXEngine)': 'library/nxengine.md'
- 'Cannonball': 'library/cannonball.md'
- 'ChaiLove': 'library/chailove.md'