diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d007ff7..233d5797 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,9 +95,9 @@ endif()
 set(PROGRAM_PREFIX "" CACHE STRING "Name prefix for executables")
 
 # List of families to build
-set(FAMILIES generic ice40 ecp5 nexus gowin fpga_interchange machxo2 cyclonev)
+set(FAMILIES generic ice40 ecp5 nexus gowin fpga_interchange machxo2 mistral)
 set(STABLE_FAMILIES generic ice40 ecp5)
-set(EXPERIMENTAL_FAMILIES nexus gowin fpga_interchange machxo2 cyclonev)
+set(EXPERIMENTAL_FAMILIES nexus gowin fpga_interchange machxo2 mistral)
 
 set(ARCH "" CACHE STRING "Architecture family for nextpnr build")
 set_property(CACHE ARCH PROPERTY STRINGS ${FAMILIES})
diff --git a/cyclonev/arch.cc b/mistral/arch.cc
similarity index 100%
rename from cyclonev/arch.cc
rename to mistral/arch.cc
diff --git a/cyclonev/arch.h b/mistral/arch.h
similarity index 100%
rename from cyclonev/arch.h
rename to mistral/arch.h
diff --git a/cyclonev/archdefs.h b/mistral/archdefs.h
similarity index 100%
rename from cyclonev/archdefs.h
rename to mistral/archdefs.h
diff --git a/cyclonev/constids.inc b/mistral/constids.inc
similarity index 100%
rename from cyclonev/constids.inc
rename to mistral/constids.inc
diff --git a/cyclonev/family.cmake b/mistral/family.cmake
similarity index 75%
rename from cyclonev/family.cmake
rename to mistral/family.cmake
index 92ec7d12..441d81db 100644
--- a/cyclonev/family.cmake
+++ b/mistral/family.cmake
@@ -1,7 +1,7 @@
 set(MISTRAL_ROOT "" CACHE STRING "Mistral install path")
 
-aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_FILES)
-add_library(mistral STATIC ${MISTRAL_FILES})
+aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_LIB_FILES)
+add_library(mistral STATIC ${MISTRAL_LIB_FILES})
 
 find_package(LibLZMA REQUIRED)
 
diff --git a/cyclonev/io.cc b/mistral/io.cc
similarity index 100%
rename from cyclonev/io.cc
rename to mistral/io.cc
diff --git a/cyclonev/lab.cc b/mistral/lab.cc
similarity index 100%
rename from cyclonev/lab.cc
rename to mistral/lab.cc
diff --git a/cyclonev/main.cc b/mistral/main.cc
similarity index 100%
rename from cyclonev/main.cc
rename to mistral/main.cc