14 files changed, 47 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cb8618..a81bd5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,13 @@ if(PROJECT_IS_TOP_LEVEL)
       ON
       CACHE BOOL "")
 
-  # Let the demo executable find the library at run time.
+  # Let the jetting-interface executable find the library at run time.
   set(CMAKE_BUILD_RPATH "${PROJECT_BINARY_DIR}/qml/Xpl2")
 endif()
 
 add_subdirectory(src)
 
 if(PROJECT_IS_TOP_LEVEL)
-  add_subdirectory(demo)
-  add_subdirectory(mock-server)
+  add_subdirectory(jetting-interface)
+  add_subdirectory(mock-jetting-controller)
 endif()
diff --git a/README.md b/README.md
index f82cf68..d0f089c 100644
--- a/README.md
+++ b/README.md
@@ -20,17 +20,17 @@ Produces three targets:
 | Target | Binary | Description |
 |---|---|---|
 | `QtXpl2` | `libQtXpl2.a` | Static library + QML module (`import Xpl2`) |
-| `QtXpl2Demo` | `bin/QtXpl2Demo` | Interactive demo app |
-| `Xpl2MockServer` | `bin/Xpl2MockServer` | Mock JI2 server for development |
+| `JettingInterfaceDemo` | `bin/JettingInterfaceDemo` | Interactive demo app |
+| `MockJettingController` | `bin/MockJettingController` | Mock JI2 server for development |
 
 ## Quick start
 
 ```bash
 # Terminal 1 — start the mock server
-./build/bin/Xpl2MockServer
+./build/bin/MockJettingController
 
 # Terminal 2 — run the demo
-./build/bin/QtXpl2Demo
+./build/bin/JettingInterfaceDemo
 ```
 
 The demo connects to `127.0.0.1` by default. Click **Connect**, then explore the **Commands** and **Status** tabs.
@@ -139,14 +139,14 @@ QtXpl2/
     Xpl2JcStatus.h/cpp      # Q_GADGET for JC status (Appendix A)
     Xpl2PhStatus.h/cpp      # Q_GADGET for PH status (Appendix B)
     CMakeLists.txt
-  demo/
+  jetting-interface/
     Main.qml                # App shell: connection, tabs, console
     CommandsPage.qml         # GS/CN/CF/imaging buttons, printhead list
     StatusPage.qml           # Status messaging controls, live displays
     DebugConsole.qml         # Dark log panel
     main.cpp
     CMakeLists.txt
-  mock-server/
+  mock-jetting-controller/
     MockServer.h/cpp         # Canned responses, periodic status emission
     main.cpp
     CMakeLists.txt
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
deleted file mode 100644
index aa8fd49..0000000
--- a/demo/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-qt_add_executable(QtXpl2Demo main.cpp)
-
-qt_add_qml_module(
-  QtXpl2Demo
-  URI
-  QtXpl2Demo
-  VERSION
-  1.0
-  QML_FILES
-  Main.qml
-  CommandsPage.qml
-  StatusPage.qml
-  DebugConsole.qml
-  # IMPORT_PATH sets QT_QML_IMPORT_PATH on the target, which qmlls reads to
-  # resolve imports like "import Xpl2" in .qmlls.ini.
-  IMPORT_PATH
-  "${PROJECT_BINARY_DIR}/qml")
-
-set_target_properties(QtXpl2Demo PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                            "${PROJECT_BINARY_DIR}/bin")
-
-target_link_libraries(QtXpl2Demo PRIVATE Qt6::Quick QtXpl2plugin)
-target_include_directories(QtXpl2Demo PRIVATE "${PROJECT_SOURCE_DIR}/src")
diff --git a/jetting-interface/CMakeLists.txt b/jetting-interface/CMakeLists.txt
new file mode 100644
index 0000000..4d46ba6
--- /dev/null
+++ b/jetting-interface/CMakeLists.txt
@@ -0,0 +1,25 @@
+qt_add_executable(JettingInterfaceDemo main.cpp)
+
+qt_add_qml_module(
+  JettingInterfaceDemo
+  URI
+  JettingInterfaceDemo
+  VERSION
+  1.0
+  QML_FILES
+  Main.qml
+  CommandsPage.qml
+  StatusPage.qml
+  DebugConsole.qml
+  # IMPORT_PATH sets QT_QML_IMPORT_PATH on the target, which qmlls reads to
+  # resolve imports like "import Xpl2" in .qmlls.ini.
+  IMPORT_PATH
+  "${PROJECT_BINARY_DIR}/qml")
+
+set_target_properties(
+  JettingInterfaceDemo PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                  "${PROJECT_BINARY_DIR}/bin")
+
+target_link_libraries(JettingInterfaceDemo PRIVATE Qt6::Quick QtXpl2plugin)
+target_include_directories(JettingInterfaceDemo
+                           PRIVATE "${PROJECT_SOURCE_DIR}/src")
diff --git a/demo/CommandsPage.qml b/jetting-interface/CommandsPage.qml
index 5a084e6..5a084e6 100644
--- a/demo/CommandsPage.qml
+++ b/jetting-interface/CommandsPage.qml
diff --git a/demo/DebugConsole.qml b/jetting-interface/DebugConsole.qml
index 9a5a9ff..9a5a9ff 100644
--- a/demo/DebugConsole.qml
+++ b/jetting-interface/DebugConsole.qml
diff --git a/demo/Main.qml b/jetting-interface/Main.qml
index 6aca201..1c7b553 100644
--- a/demo/Main.qml
+++ b/jetting-interface/Main.qml
@@ -12,7 +12,7 @@ ApplicationWindow {
     required property int demoPhCount
 
     height: 1200
-    title: "XPL2 Demo"
+    title: "Jetting Interface"
     visible: true
     width: 900
 
diff --git a/demo/StatusPage.qml b/jetting-interface/StatusPage.qml
index 6a85bcc..6a85bcc 100644
--- a/demo/StatusPage.qml
+++ b/jetting-interface/StatusPage.qml
diff --git a/demo/main.cpp b/jetting-interface/main.cpp
index e0651d9..b88bd37 100644
--- a/demo/main.cpp
+++ b/jetting-interface/main.cpp
@@ -1,6 +1,6 @@
 /**
  * @file   main.cpp
- * @brief  Entry point for the QtXpl2 demo application.
+ * @brief  Entry point for the Jetting Interface demo application.
  */
 #include "Xpl2Client.h"
 
@@ -14,7 +14,7 @@ Q_IMPORT_QML_PLUGIN (Xpl2Plugin)
 int
 main (int argc, char *argv[])
 {
-  qSetMessagePattern ("Demo       [%{time HH:mm:ss.zzz}] %{message}");
+  qSetMessagePattern ("JI         [%{time HH:mm:ss.zzz}] %{message}");
 
   QGuiApplication app (argc, argv);
 
@@ -37,6 +37,6 @@ main (int argc, char *argv[])
       &engine, &QQmlApplicationEngine::objectCreationFailed, &app,
       [] () { QCoreApplication::exit (1); }, Qt::QueuedConnection);
 
-  engine.loadFromModule ("QtXpl2Demo", "Main");
+  engine.loadFromModule ("JettingInterfaceDemo", "Main");
   return app.exec ();
 }
diff --git a/mock-jetting-controller/CMakeLists.txt b/mock-jetting-controller/CMakeLists.txt
new file mode 100644
index 0000000..87e518b
--- /dev/null
+++ b/mock-jetting-controller/CMakeLists.txt
@@ -0,0 +1,7 @@
+qt_add_executable(MockJettingController main.cpp MockServer.h MockServer.cpp)
+
+set_target_properties(
+  MockJettingController PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                   "${PROJECT_BINARY_DIR}/bin")
+
+target_link_libraries(MockJettingController PRIVATE Qt6::Core Qt6::Network)
diff --git a/mock-server/MockServer.cpp b/mock-jetting-controller/MockServer.cpp
index 08eb116..08eb116 100644
--- a/mock-server/MockServer.cpp
+++ b/mock-jetting-controller/MockServer.cpp
diff --git a/mock-server/MockServer.h b/mock-jetting-controller/MockServer.h
index 242cb32..242cb32 100644
--- a/mock-server/MockServer.h
+++ b/mock-jetting-controller/MockServer.h
diff --git a/mock-server/main.cpp b/mock-jetting-controller/main.cpp
index 9a55463..e5677fa 100644
--- a/mock-server/main.cpp
+++ b/mock-jetting-controller/main.cpp
@@ -1,6 +1,6 @@
 /**
  * @file   main.cpp
- * @brief  Mock XPL2 server on three protocol ports.
+ * @brief  Mock jetting controller on three protocol ports.
  */
 #include "MockServer.h"
 
@@ -10,7 +10,7 @@
 int
 main (int argc, char *argv[])
 {
-  qSetMessagePattern ("MockServer [%{time HH:mm:ss.zzz}] %{message}");
+  qSetMessagePattern ("MockJC     [%{time HH:mm:ss.zzz}] %{message}");
 
   QCoreApplication app (argc, argv);
 
diff --git a/mock-server/CMakeLists.txt b/mock-server/CMakeLists.txt
deleted file mode 100644
index abcb65c..0000000
--- a/mock-server/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-qt_add_executable(Xpl2MockServer main.cpp MockServer.h MockServer.cpp)
-
-set_target_properties(Xpl2MockServer PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                                "${PROJECT_BINARY_DIR}/bin")
-
-target_link_libraries(Xpl2MockServer PRIVATE Qt6::Core Qt6::Network)