--- a/doc/Cardem-plans	Thu Sep 21 05:00:50 2023 +0000
+++ b/doc/Cardem-plans	Thu Sep 21 06:31:34 2023 +0000
@@ -1,6 +1,6 @@
-The long-term goal of SIMtrace3 project is to support both SIM interface
-sniffing and card emulation.  Both functions are needed when working in the
-realm of Vintage Mobile Phones:
+The long-term goal of FreeCalypso SIMtrace replacement project is to support
+both SIM interface sniffing (SIMsniff) and card emulation (SIMemu).  Both
+functions are needed when working in the realm of Vintage Mobile Phones:
 
 * Non-invasive, Heisenbug-free Hi-Z sniffing is needed in order to see why
   certain phone-to-SIM combinations work while others don't, and to see exactly
@@ -13,30 +13,30 @@
   like.
 
 However, in terms of scheduling priority, all of our initial work focuses on
-the sniffer, with cardem deferred to some indefinite later time.  We do,
-however, have a preliminary idea of how we envision cardem working:
+the sniffer, with SIMemu (cardem) deferred to some indefinite later time.  We
+do, however, have a preliminary idea of how we envision card emulation working:
 
-* Hardware setups will be different between sniffing and cardem.  Our initial
+* Hardware setups will be different between SIMsniff and SIMemu.  Our initial
   objective is to produce a solidly usable, production quality sniffer pod,
   described as HW setup version 2 in the Sniffing-hw-setup article.  As the
   name says, this pod will be for sniffing only.  For card emulation there will
-  be a different cardem pod.
+  be a different SIMemu pod.
 
-* The cardem pod will be similar to the sniffer pod, with just two changes:
+* The SIMemu pod will be similar to the SIMsniff pod, with just two changes:
 
   - We'll add a 74LVC1G07 OD driver for pulling the I/O line low in exactly the
     same way how real SIM cards do it;
 
-  - The SIM socket will be eliminated from the cardem pod, to eliminate any
-    possibility of a real SIM and cardem "fighting" to talk back to the same
+  - The SIM socket will be eliminated from the SIMemu pod, to eliminate any
+    possibility of a real SIM and SIMemu "fighting" to talk back to the same
     ME/ID.
 
-* FPGA gateware will also be different between sniffing and cardem.  The cardem
+* FPGA gateware will also be different between SIMsniff and SIMemu.  The SIMemu
   design is expected to be more complex and use more FPGA resources, but there
   is a good chance it will still fit into iCE40-HX1K FPGA and thus allow us to
   keep using the same Icestick board.
 
-* Right now we have no plans to stick a soft CPU core into the FPGA for cardem,
+* Right now we have no plans to stick a soft CPU core into the FPGA for SIMemu,
   instead the plan is to use the same principal architecture as the sniffer
   FPGA, using the UART channel at 3 Mbps to communicate with the host - although
   this time this UART will be used bidirectionally.