diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
index 63204e2154..3f17527e0c 100644
--- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
@@ -74,7 +74,7 @@ ActorEditor::ActorEditor(wxWindow* parent)
 	materialsPanel->SetSizer(materialsSizer);
 
 	// Get the list of XML materials
-	wxArrayString materials = Datafile::EnumerateDataFiles(_T("mods/official/art/materials/"), _T("*.xml"));
+	wxArrayString materials = Datafile::EnumerateDataFiles(_T("mods/public/art/materials/"), _T("*.xml"));
 	// Extract the filenames and discard the path
 	for (size_t i = 0; i < materials.Count(); ++i)
 		materials[i] = wxFileName(materials[i]).GetFullName();
@@ -352,7 +352,7 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 	wxString entityName = currentFilename.GetName();
 
 	// Work out where the entities are stored
-	wxFileName entityPath (_T("mods/official/entities/"));
+	wxFileName entityPath (_T("mods/public/entities/"));
 	entityPath.MakeAbsolute(Datafile::GetDataDirectory());
 
 	// Make sure the user knows what's going on
@@ -383,7 +383,7 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 		return; // cancelled by user
 
 	// Get this actor's filename, relative to actors/
-	wxFileName actorPath (_T("mods/official/art/actors/"));
+	wxFileName actorPath (_T("mods/public/art/actors/"));
 	actorPath.MakeAbsolute(Datafile::GetDataDirectory());
 	wxFileName actorFilename (currentFilename);
 	actorFilename.MakeRelativeTo(actorPath.GetFullPath());
@@ -413,7 +413,7 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
 
 wxString ActorEditor::GetDefaultOpenDirectory()
 {
-	wxFileName dir (_T("mods/official/art/actors/"), wxPATH_UNIX);
+	wxFileName dir (_T("mods/public/art/actors/"), wxPATH_UNIX);
 	dir.MakeAbsolute(Datafile::GetDataDirectory());
 	return dir.GetPath();
 }
diff --git a/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.cpp b/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.cpp
index fd2a071e97..39b8ca9364 100644
--- a/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.cpp
+++ b/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.cpp
@@ -390,7 +390,7 @@ void ActorViewer::OnActorEdited()
 
 void ActorViewer::OnEditButton(wxCommandEvent& WXUNUSED(event))
 {
-	wxFileName dir (_T("mods/official/art/actors/") + m_CurrentActor, wxPATH_UNIX);
+	wxFileName dir (_T("mods/public/art/actors/") + m_CurrentActor, wxPATH_UNIX);
 	dir.MakeAbsolute(Datafile::GetDataDirectory());
 
 	ActorEditor* ed = new ActorEditor(NULL);
diff --git a/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp b/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
index ad91f71846..7b2af92aa1 100644
--- a/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/ColourTester/ColourTesterFileCtrl.cpp
@@ -13,7 +13,7 @@ ColourTesterFileCtrl::ColourTesterFileCtrl(wxWindow* parent, const wxSize& size,
 	: wxVirtualDirTreeCtrl(parent, wxID_ANY, wxDefaultPosition, size),
 	m_ImageCtrl(imgctrl)
 {
-	wxFileName path (_T("mods/official/art/textures/skins/"));
+	wxFileName path (_T("mods/public/art/textures/skins/"));
 	path.MakeAbsolute(Datafile::GetDataDirectory());
 	wxASSERT(path.IsOk());
 	SetRootPath(path.GetPath());
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
index 5922eb5662..fe35753111 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
@@ -120,7 +120,7 @@ FieldEditCtrl_File::FieldEditCtrl_File(const wxString& rootDir, const wxString&
 	: m_FileMask(fileMask)
 {
 	// Make the rootDir path absolute (where rootDir is relative to binaries/system):
-	wxFileName path (_T("mods/official/") + rootDir);
+	wxFileName path (_T("mods/public/") + rootDir);
 	wxASSERT(path.IsOk());
 	path.MakeAbsolute(Datafile::GetDataDirectory());
 	wxASSERT(path.IsOk());
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h
index d911164235..020c3bb30a 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.h
@@ -66,7 +66,7 @@ private:
 class FieldEditCtrl_File : public FieldEditCtrl
 {
 public:
-	// rootDir is relative to mods/official, and must end with a /
+	// rootDir is relative to mods/public, and must end with a /
 	FieldEditCtrl_File(const wxString& rootDir, const wxString& fileMask);
 
 protected:
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
index 0d10081b48..373655abbf 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@@ -554,7 +554,7 @@ void ScenarioEditor::OpenFile(const wxString& name)
 void ScenarioEditor::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
 	wxFileDialog dlg (NULL, wxFileSelectorPromptStr,
-		Datafile::GetDataDirectory() + _T("/mods/official/maps/scenarios"), m_OpenFilename,
+		Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
 		_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
 		wxOPEN);
 
@@ -602,7 +602,7 @@ void ScenarioEditor::OnSave(wxCommandEvent& event)
 void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED(event))
 {
 	wxFileDialog dlg (NULL, wxFileSelectorPromptStr,
-		Datafile::GetDataDirectory() + _T("/mods/official/maps/scenarios"), m_OpenFilename,
+		Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
 		_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
 		wxSAVE | wxOVERWRITE_PROMPT);