diff --git a/servant.core b/servant.core
index ea73c1d..e4e482a 100644
--- a/servant.core
+++ b/servant.core
@@ -19,13 +19,15 @@ filesets:
     depend : [vlog_tb_utils]
 
   service:
-    files: [servant/ice40_pll.v, servant/service.v]
+    files:
+      - servant/ice40_pll.v
+      - servant/service_clock_gen.v
+      - servant/service.v
     file_type : verilogSource
     depend : ["fusesoc:utils:generators"]
 
   soc:
     files:
-      - servant/servant_clock_gen.v
       - servant/servant_timer.v
       - servant/servant_gpio.v
       - servant/servant_arbiter.v
diff --git a/servant/service.v b/servant/service.v
index 0f60a99..ced0975 100644
--- a/servant/service.v
+++ b/servant/service.v
@@ -11,7 +11,7 @@ module service
    wire      wb_clk;
    wire      wb_rst;
 
-   servant_clock_gen #(.PLL (PLL))
+   service_clock_gen #(.PLL (PLL))
    clock_gen
      (.i_clk (i_clk),
       .o_clk (wb_clk),
diff --git a/servant/servant_clock_gen.v b/servant/service_clock_gen.v
similarity index 95%
rename from servant/servant_clock_gen.v
rename to servant/service_clock_gen.v
index c430de8..c67f617 100644
--- a/servant/servant_clock_gen.v
+++ b/servant/service_clock_gen.v
@@ -1,5 +1,5 @@
 `default_nettype none
-module servant_clock_gen
+module service_clock_gen
   (
    input wire  i_clk,
    output wire o_clk,