diff --git a/.gitignore b/.gitignore
index de1122fc..f308b34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /generated/
 /objs/
-/nextpnr-dummy*
+/nextpnr-generic*
 /nextpnr-ice40*
 cmake-build-*/
 Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 428b137a..ad21b04d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ option(BUILD_PYTHON "Build Python Integration" ON)
 option(BUILD_TESTS "Build GUI" OFF)
 
 # List of families to build
-set(FAMILIES dummy ice40)
+set(FAMILIES generic ice40)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb")
 set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g")
@@ -194,4 +194,4 @@ unset(SANITIZE_ADDRESS CACHE)
 unset(SANITIZE_MEMORY CACHE)
 unset(SANITIZE_THREAD CACHE)
 unset(SANITIZE_UNDEFINED CACHE)
-unset(SANITIZE_LINK_STATIC CACHE)
\ No newline at end of file
+unset(SANITIZE_LINK_STATIC CACHE)
diff --git a/dummy/arch.cc b/generic/arch.cc
similarity index 99%
rename from dummy/arch.cc
rename to generic/arch.cc
index 9d29921c..9bdda5ba 100644
--- a/dummy/arch.cc
+++ b/generic/arch.cc
@@ -24,7 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN
 
 Arch::Arch(ArchArgs) {}
 
-std::string Arch::getChipName() { return "Dummy"; }
+std::string Arch::getChipName() { return "Generic"; }
 
 void IdString::initialize_arch(const BaseCtx *ctx) {}
 
diff --git a/dummy/arch.h b/generic/arch.h
similarity index 98%
rename from dummy/arch.h
rename to generic/arch.h
index 59e143e6..ae68b974 100644
--- a/dummy/arch.h
+++ b/generic/arch.h
@@ -36,7 +36,7 @@ struct Arch : BaseCtx
     virtual IdString id(const std::string &s) const { abort(); }
     virtual IdString id(const char *s) const { abort(); }
 
-    IdString archId() const { return id("dummy"); }
+    IdString archId() const { return id("generic"); }
     IdString archArgsToId(ArchArgs args) const { return id("none"); }
 
     IdString belTypeToId(BelType type) const { return type; }
diff --git a/dummy/archdefs.h b/generic/archdefs.h
similarity index 100%
rename from dummy/archdefs.h
rename to generic/archdefs.h
diff --git a/dummy/family.cmake b/generic/family.cmake
similarity index 100%
rename from dummy/family.cmake
rename to generic/family.cmake
diff --git a/dummy/main.cc b/generic/main.cc
similarity index 100%
rename from dummy/main.cc
rename to generic/main.cc
diff --git a/dummy/place_legaliser.cc b/generic/place_legaliser.cc
similarity index 100%
rename from dummy/place_legaliser.cc
rename to generic/place_legaliser.cc
diff --git a/dummy/place_legaliser.h b/generic/place_legaliser.h
similarity index 100%
rename from dummy/place_legaliser.h
rename to generic/place_legaliser.h
diff --git a/dummy/pybindings.cc b/generic/pybindings.cc
similarity index 100%
rename from dummy/pybindings.cc
rename to generic/pybindings.cc
diff --git a/gui/dummy/mainwindow.cc b/gui/generic/mainwindow.cc
similarity index 89%
rename from gui/dummy/mainwindow.cc
rename to gui/generic/mainwindow.cc
index e86edafd..fef63094 100644
--- a/gui/dummy/mainwindow.cc
+++ b/gui/generic/mainwindow.cc
@@ -27,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent)
 {
     initMainResource();
 
-    std::string title = "nextpnr-dummy - [EMPTY]";
+    std::string title = "nextpnr-generic - [EMPTY]";
     setWindowTitle(title.c_str());
 
     createMenu();
@@ -37,7 +37,7 @@ MainWindow::~MainWindow() {}
 
 void MainWindow::createMenu()
 {
-    QMenu *menu_Custom = new QMenu("&Dummy", menuBar);
+    QMenu *menu_Custom = new QMenu("&Generic", menuBar);
     menuBar->addAction(menu_Custom->menuAction());
 }
 
diff --git a/gui/dummy/mainwindow.h b/gui/generic/mainwindow.h
similarity index 100%
rename from gui/dummy/mainwindow.h
rename to gui/generic/mainwindow.h
diff --git a/gui/dummy/nextpnr.qrc b/gui/generic/nextpnr.qrc
similarity index 100%
rename from gui/dummy/nextpnr.qrc
rename to gui/generic/nextpnr.qrc