diff --git a/npc/constr/Keyboard.nxdc b/npc/constr/Keyboard.nxdc
index 1493c31..261b52a 100644
--- a/npc/constr/Keyboard.nxdc
+++ b/npc/constr/Keyboard.nxdc
@@ -2,6 +2,6 @@ top=Keyboard
 
 io_ps2_clk PS2_CLK
 io_ps2_data PS2_DAT
-io_seg_0 (SEG1A, SEG1B, SEG1C, SEG1D, SEG1E, SEG1F, SEG1G, DEC1P, SEG0A, SEG0B, SEG0C, SEG0D, SEG0E, SEG0F, SEG0G, DEC0P)
-io_seg_1 (SEG3A, SEG3B, SEG3C, SEG3D, SEG3E, SEG3F, SEG3G, DEC3P, SEG2A, SEG2B, SEG2C, SEG2D, SEG2E, SEG2F, SEG2G, DEC2P)
-io_seg_2 (SEG5A, SEG5B, SEG5C, SEG5D, SEG5E, SEG5F, SEG5G, DEC5P, SEG4A, SEG4B, SEG4C, SEG4D, SEG4E, SEG4F, SEG4G, DEC4P)
+io_segs_0 (SEG1A, SEG1B, SEG1C, SEG1D, SEG1E, SEG1F, SEG1G, DEC1P, SEG0A, SEG0B, SEG0C, SEG0D, SEG0E, SEG0F, SEG0G, DEC0P)
+io_segs_1 (SEG3A, SEG3B, SEG3C, SEG3D, SEG3E, SEG3F, SEG3G, DEC3P, SEG2A, SEG2B, SEG2C, SEG2D, SEG2E, SEG2F, SEG2G, DEC2P)
+io_segs_2 (SEG5A, SEG5B, SEG5C, SEG5D, SEG5E, SEG5F, SEG5G, DEC5P, SEG4A, SEG4B, SEG4C, SEG4D, SEG4E, SEG4F, SEG4G, DEC4P)
diff --git a/npc/csrc_nvboard/main.cpp b/npc/csrc_nvboard/main.cpp
index 401de4b..c1adb52 100644
--- a/npc/csrc_nvboard/main.cpp
+++ b/npc/csrc_nvboard/main.cpp
@@ -4,14 +4,14 @@
 #include <verilated.h>
 #include <verilated_vcd_c.h>
 #include <nvboard.h>
-#include <VSwitch.h>
+#include <VKeyboard.h>
 
 const int MAX_SIM_TIME=100;
 
-void nvboard_bind_all_pins(VSwitch* top);
+void nvboard_bind_all_pins(VKeyboard* top);
 
 int main(int argc, char **argv, char **env) {
-    VSwitch *top = new VSwitch;
+    VKeyboard *top = new VKeyboard;
 
     nvboard_bind_all_pins(top);
     nvboard_init();