diff --git a/Makefile b/Makefile
index 9d36450..00e0263 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #
 # SPDX-License-Identifier:ISC
 
-PLUGIN_LIST := fasm xdc params sdc ql-iob design_introspection integrateinv ql-qlf uhdm dsp_ff
+PLUGIN_LIST := fasm xdc params sdc ql-iob design_introspection integrateinv ql-qlf uhdm dsp-ff
 PLUGINS := $(foreach plugin,$(PLUGIN_LIST),$(plugin).so)
 PLUGINS_INSTALL := $(foreach plugin,$(PLUGIN_LIST),install_$(plugin))
 PLUGINS_CLEAN := $(foreach plugin,$(PLUGIN_LIST),clean_$(plugin))
diff --git a/Makefile_plugin.common b/Makefile_plugin.common
index 0870f21..49d6ab5 100644
--- a/Makefile_plugin.common
+++ b/Makefile_plugin.common
@@ -55,7 +55,7 @@
 DATA_DIR ?= $(shell $(YOSYS_CONFIG) --datdir)
 EXTRA_FLAGS ?=
 
-OBJS := $(SOURCES:cc=o)
+OBJS := $(patsubst %.cc,%.o,$(SOURCES))
 
 all: $(NAME).so
 
diff --git a/dsp_ff-plugin/Makefile b/dsp-ff-plugin/Makefile
similarity index 100%
rename from dsp_ff-plugin/Makefile
rename to dsp-ff-plugin/Makefile
diff --git a/dsp_ff-plugin/dsp_ff.cc b/dsp-ff-plugin/dsp_ff.cc
similarity index 100%
rename from dsp_ff-plugin/dsp_ff.cc
rename to dsp-ff-plugin/dsp_ff.cc
diff --git a/dsp_ff-plugin/nexus-dsp_rules.txt b/dsp-ff-plugin/nexus-dsp_rules.txt
similarity index 100%
rename from dsp_ff-plugin/nexus-dsp_rules.txt
rename to dsp-ff-plugin/nexus-dsp_rules.txt
diff --git a/dsp_ff-plugin/tests/Makefile b/dsp-ff-plugin/tests/Makefile
similarity index 100%
rename from dsp_ff-plugin/tests/Makefile
rename to dsp-ff-plugin/tests/Makefile
diff --git a/dsp_ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.tcl b/dsp-ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.tcl
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.tcl
rename to dsp-ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.tcl
diff --git a/dsp_ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.v b/dsp-ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.v
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.v
rename to dsp-ff-plugin/tests/nexus_conn_conflict/nexus_conn_conflict.v
diff --git a/dsp_ff-plugin/tests/nexus_conn_share/nexus_conn_share.tcl b/dsp-ff-plugin/tests/nexus_conn_share/nexus_conn_share.tcl
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_conn_share/nexus_conn_share.tcl
rename to dsp-ff-plugin/tests/nexus_conn_share/nexus_conn_share.tcl
diff --git a/dsp_ff-plugin/tests/nexus_conn_share/nexus_conn_share.v b/dsp-ff-plugin/tests/nexus_conn_share/nexus_conn_share.v
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_conn_share/nexus_conn_share.v
rename to dsp-ff-plugin/tests/nexus_conn_share/nexus_conn_share.v
diff --git a/dsp_ff-plugin/tests/nexus_fftypes/nexus_fftypes.tcl b/dsp-ff-plugin/tests/nexus_fftypes/nexus_fftypes.tcl
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_fftypes/nexus_fftypes.tcl
rename to dsp-ff-plugin/tests/nexus_fftypes/nexus_fftypes.tcl
diff --git a/dsp_ff-plugin/tests/nexus_fftypes/nexus_fftypes.v b/dsp-ff-plugin/tests/nexus_fftypes/nexus_fftypes.v
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_fftypes/nexus_fftypes.v
rename to dsp-ff-plugin/tests/nexus_fftypes/nexus_fftypes.v
diff --git a/dsp_ff-plugin/tests/nexus_mult/README.md b/dsp-ff-plugin/tests/nexus_mult/README.md
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_mult/README.md
rename to dsp-ff-plugin/tests/nexus_mult/README.md
diff --git a/dsp_ff-plugin/tests/nexus_mult/nexus_mult.tcl b/dsp-ff-plugin/tests/nexus_mult/nexus_mult.tcl
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_mult/nexus_mult.tcl
rename to dsp-ff-plugin/tests/nexus_mult/nexus_mult.tcl
diff --git a/dsp_ff-plugin/tests/nexus_mult/nexus_mult.v b/dsp-ff-plugin/tests/nexus_mult/nexus_mult.v
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_mult/nexus_mult.v
rename to dsp-ff-plugin/tests/nexus_mult/nexus_mult.v
diff --git a/dsp_ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.tcl b/dsp-ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.tcl
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.tcl
rename to dsp-ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.tcl
diff --git a/dsp_ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.v b/dsp-ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.v
similarity index 100%
rename from dsp_ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.v
rename to dsp-ff-plugin/tests/nexus_param_conflict/nexus_param_conflict.v