diff --git a/README.md b/README.md
index 0be5ed79..e24bdb35 100644
--- a/README.md
+++ b/README.md
@@ -381,9 +381,9 @@ exportScriptEvents                     | Command: Generates a new script/doom_ev
 exportDeclsToJSON                      | Command: Exports all entity and model defs to exported/entities.json for usage in Blender
 postLoadExportModels                   | Cvar: Export models after loading to OBJ model format. Set it to 1 before loading a map.
 exportMapToOBJ                         | Command: Convert .map file to .obj/.mtl
-swf_exportAtlas                        | Cvar: Set to 1 at startup to dump the Flash images to exported/swf/
-swf_exportSWF                          | Cvar: Set to 1 at startup to dump the Flash .bswf files as .swf (WIP)
-swf_exportJSON                         | Cvar: Set to 1 at startup to dump the Flash .bswf files as .json. Can be reimported into the engine and imported into Blender for inspection
+postLoadExportFlashAtlas               | Cvar: Set to 1 at startup to dump the Flash images to exported/swf/
+postLoadExportFlashToSWF               | Cvar: Set to 1 at startup to dump the Flash .bswf files as .swf (WIP)
+postLoadExportFlashToJSON              | Cvar: Set to 1 at startup to dump the Flash .bswf files as .json. Can be reimported into the engine and imported into Blender for inspection
 swf_show                               | Cvar: Draws the bounding box of instanced Flash sprites in red and their names
 dmap <mapfile>                         | Command: Compiles a .map to its corresponding BSP .proc, Collision .cm files and Area Awareness System (AI navigation) .aas files. Just type dmap to list all options
 dmap -glview <mapfile>                 | DMap option that exports the BSP areas and portals to .obj for debugging purposes
diff --git a/neo/renderer/Image_files.cpp b/neo/renderer/Image_files.cpp
index d3b5f888..664a208b 100644
--- a/neo/renderer/Image_files.cpp
+++ b/neo/renderer/Image_files.cpp
@@ -3,7 +3,7 @@
 
 Doom 3 BFG Edition GPL Source Code
 Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
-Copyright (C) 2012-2014 Robert Beckebans
+Copyright (C) 2012-2020 Robert Beckebans
 
 This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
 
diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp
index 33dfd3c8..78abf1a8 100644
--- a/neo/renderer/Image_load.cpp
+++ b/neo/renderer/Image_load.cpp
@@ -3,7 +3,7 @@
 
 Doom 3 BFG Edition GPL Source Code
 Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
-Copyright (C) 2013-2017 Robert Beckebans
+Copyright (C) 2013-2020 Robert Beckebans
 Copyright (C) 2014-2016 Kot in Action Creative Artel
 Copyright (C) 2016-2017 Dustin Land
 
@@ -320,6 +320,16 @@ void idImage::ActuallyLoadImage( bool fromBackEnd )
 		}
 	}
 
+	// RB: PBR HACK - RMAO maps should end with _rmao insted of _s
+	if( usage == TD_SPECULAR_PBR_RMAO )
+	{
+		if( imgName.StripTrailingOnce( "_s" ) )
+		{
+			imgName += "_rmao";
+		}
+	}
+	// RB end
+
 	// Figure out opts.colorFormat and opts.format so we can make sure the binary image is up to date
 	DeriveOpts();