3 files changed, 13 insertions, 13 deletions
diff --git a/nandgame/cpp/Vcomputer__main.cpp b/nandgame/cpp/Vcomputer__main.cpp
index 5b7f615..ec9eb31 100644
--- a/nandgame/cpp/Vcomputer__main.cpp
+++ b/nandgame/cpp/Vcomputer__main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char **argv, char **) {
     exit(-1);
   }
 
-  draw_init();
+  simpc_ui_init();
 
   while (VL_LIKELY(!contextp->gotFinish()) && i < 500) {
     // doesn't work.
@@ -61,7 +61,7 @@ int main(int argc, char **argv, char **) {
       topp->clk_in = !topp->clk_in;
     }
 
-    draw_ui(topp, i, StepPosition_t::BEFORE_EVAL);
+    simpc_ui_write(topp, i, StepPosition_t::BEFORE_EVAL);
 
     // Evaluate model
     topp->eval();
@@ -70,14 +70,14 @@ int main(int argc, char **argv, char **) {
     if (topp->halt)
       break;
 
-    draw_ui(topp, i, StepPosition_t::AFTER_EVAL);
+    simpc_ui_write(topp, i, StepPosition_t::AFTER_EVAL);
 
     // Advance time
     contextp->timeInc(1);
     i++;
   }
 
-  draw_finish(contextp, topp);
+  simpc_ui_finish_message(contextp, topp);
 
   if (VL_LIKELY(!contextp->gotFinish())) {
     VL_DEBUG_IF(VL_PRINTF("+ Exiting without $finish; no events left\n"););
@@ -94,7 +94,7 @@ int main(int argc, char **argv, char **) {
   // Print statistical summary report
   // contextp->statsPrintSummary();
 
-  ui_finish();
+  simpc_ui_cleanup();
 
   return 0;
 }
diff --git a/nandgame/cpp/simpc_ui.cpp b/nandgame/cpp/simpc_ui.cpp
index 5a75121..44d3424 100644
--- a/nandgame/cpp/simpc_ui.cpp
+++ b/nandgame/cpp/simpc_ui.cpp
@@ -42,7 +42,7 @@
 #include <cstdio>
 #include <sched.h>
 
-void draw_ui(const std::unique_ptr<Vcomputer> &topp, int &i,
+void simpc_ui_write(const std::unique_ptr<Vcomputer> &topp, int &i,
              StepPosition_t sp) {
   uint16_t opcode = topp->computer->PC_content_int;
 
@@ -77,7 +77,7 @@ void draw_ui(const std::unique_ptr<Vcomputer> &topp, int &i,
   PRINT_NEXT();
 }
 
-void draw_finish(const std::unique_ptr<VerilatedContext> &contextp,
+void simpc_ui_finish_message(const std::unique_ptr<VerilatedContext> &contextp,
                  const std::unique_ptr<Vcomputer> &topp) {
 #if NCUR
   refresh();
@@ -92,14 +92,14 @@ void draw_finish(const std::unique_ptr<VerilatedContext> &contextp,
   }
 }
 
-void draw_init(void) {
+void simpc_ui_init(void) {
 #if NCUR
   initscr();
   curs_set(0);
 #endif
 }
 
-void ui_finish(void) {
+void simpc_ui_cleanup(void) {
 #if NCUR
   getch();
   endwin();
diff --git a/nandgame/cpp/simpc_ui.h b/nandgame/cpp/simpc_ui.h
index 8e07092..3312b64 100644
--- a/nandgame/cpp/simpc_ui.h
+++ b/nandgame/cpp/simpc_ui.h
@@ -5,8 +5,8 @@
 
 #include <memory>
 
-void draw_init(void);
-void draw_ui(const std::unique_ptr<Vcomputer> &topp, int &i, StepPosition_t sp);
-void draw_finish(const std::unique_ptr<VerilatedContext> &contextp,
+void simpc_ui_init(void);
+void simpc_ui_write(const std::unique_ptr<Vcomputer> &topp, int &i, StepPosition_t sp);
+void simpc_ui_finish_message(const std::unique_ptr<VerilatedContext> &contextp,
                  const std::unique_ptr<Vcomputer> &topp);
-void ui_finish(void);
+void simpc_ui_cleanup(void);