diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java
index e47770744..04f2369ba 100644
--- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java
+++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java
@@ -28,7 +28,7 @@ public class Mock_engine implements Scrib_engine {
 		return (Scrib_lua_proc)mod_init_hash.Get_by(name);
 	}
 	public Keyval[] CallFunction(int id, Keyval[] args) {
-		Mock_proc_fxt fnc = (Mock_proc_fxt)fnc_hash.Get_by_or_fail(id);
+		Mock_proc_stub fnc = (Mock_proc_stub)fnc_hash.Get_by_or_fail(id);
 		return fnc.Exec_by_scrib(args);
 	}
 	public void RegisterLibrary(Keyval[] functions_ary) {}
@@ -36,14 +36,14 @@ public class Mock_engine implements Scrib_engine {
 	public void CleanupChunks(Keyval[] ids) {}
 	public void	Clear() {fnc_hash.Clear();}
 
-	public void	InitFunctionForTest(Mock_proc_fxt proc) {
+	public void	InitFunctionForTest(Mock_proc_stub proc) {
 		fnc_hash.Add(proc.Id(), proc);
 	}
 
 	public void Init_module(String mod_name, int mod_id) {
 		mod_init_hash.Add_if_dupe_use_nth(mod_name, new Scrib_lua_proc(mod_name, mod_id));
 	}
-	public void Init_module_func(int mod_id, Mock_proc_fxt fnc) {
+	public void Init_module_func(int mod_id, Mock_proc_stub fnc) {
 		Hash_adp funcs = (Hash_adp)mod_fnc_hash.Get_by_or_null(mod_id);
 		if (funcs == null) {
 			funcs = Hash_adp_.New();
@@ -57,3 +57,13 @@ public class Mock_engine implements Scrib_engine {
 		return (Scrib_lua_proc)funcs.Get_by_or_fail(fnc_name);
 	}
 }
+class Mock_server implements Scrib_server {
+	public void		Init(String... process_args) {}
+	public int		Server_timeout() {return server_timeout;} public Scrib_server Server_timeout_(int v) {server_timeout = v; return this;} private int server_timeout = 60;
+	public int		Server_timeout_polling() {return server_timeout_polling;} public Scrib_server Server_timeout_polling_(int v) {server_timeout_polling = v; return this;} private int server_timeout_polling = 1;
+	public int		Server_timeout_busy_wait() {return server_timeout_busy_wait;} public Scrib_server Server_timeout_busy_wait_(int v) {server_timeout_busy_wait = v; return this;} private int server_timeout_busy_wait = 1;
+	public byte[]	Server_comm(byte[] cmd, Object[] cmd_objs) {return Bry_.Empty;}
+	public void		Server_send(byte[] cmd, Object[] cmd_objs) {}
+	public byte[]	Server_recv() {return Bry_.Empty;}
+	public void		Term() {}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_fxt.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_stub.java
similarity index 86%
rename from 400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_fxt.java
rename to 400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_stub.java
index 3c0750fe2..310b68fec 100644
--- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_fxt.java
+++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_proc_stub.java
@@ -16,14 +16,14 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 package gplx.xowa.xtns.scribunto.engines.mocks; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.engines.*;
 import gplx.core.primitives.*;
 import gplx.xowa.xtns.scribunto.procs.*;
-public abstract class Mock_proc_fxt {
-	public Mock_proc_fxt(int id, String key) {this.id = id; this.key = key;}
+public abstract class Mock_proc_stub {
+	public Mock_proc_stub(int id, String key) {this.id = id; this.key = key;}
 	public int Id() {return id;} private final    int id;
 	public String Key() {return key;} private final    String key;
 	public Scrib_lua_proc To_scrib_lua_proc() {return new Scrib_lua_proc(key, id);}
 	public abstract Keyval[] Exec_by_scrib(Keyval[] args);
 }
-class Mock_exec_module extends Mock_proc_fxt { 	private final    Mock_engine engine;
+class Mock_exec_module extends Mock_proc_stub { 	private final    Mock_engine engine;
 	public Mock_exec_module(int mod_id, Mock_engine engine) {super(mod_id, "mockExecuteModule");
 		this.engine = engine;
 	}
@@ -33,7 +33,7 @@ class Mock_exec_module extends Mock_proc_fxt { 	private final    Mock_engine eng
 		return new Keyval[] {Keyval_.int_(0, true), Keyval_.int_(1, engine.Get_module_func(mod_proc.Id(), fnc_name))};
 	}
 }
-class Mock_exec_function extends Mock_proc_fxt { 	private final    Mock_engine engine;
+class Mock_exec_function extends Mock_proc_stub { 	private final    Mock_engine engine;
 	public Mock_exec_function(int func_id, Mock_engine engine) {super(func_id, "mockExecuteFuntion");
 		this.engine = engine;
 	}
@@ -42,7 +42,7 @@ class Mock_exec_function extends Mock_proc_fxt { 	private final    Mock_engine e
 		return engine.CallFunction(mod_proc.Id(), args);
 	}
 }
-class Mock_exec_lib extends Mock_proc_fxt { 	private Scrib_lib lib;
+class Mock_exec_lib extends Mock_proc_stub { 	private Scrib_lib lib;
 	private String proc_name;
 	private Keyval[] proc_args;
 	public Mock_exec_lib(int fnc_id, String fnc_name, Scrib_lib lib, String proc_name, Object... proc_obj_args) {super(fnc_id, fnc_name);
diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_scrib_fxt.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_scrib_fxt.java
index c458100f2..ecba73f56 100644
--- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_scrib_fxt.java
+++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_scrib_fxt.java
@@ -36,9 +36,9 @@ public class Mock_scrib_fxt {
 		core.Invoke_init(core.Wiki(), core.Ctx(), Bry_.Empty, parent_frame, current_frame);
 		core.When_page_changed(parser_fxt.Page());
 	}
-	public void Init__cbk(Mock_proc_fxt... ary) {
+	public void Init__cbk(Mock_proc_stub... ary) {
 		engine.Clear();
-		for (Mock_proc_fxt proc : ary)
+		for (Mock_proc_stub proc : ary)
 			engine.InitFunctionForTest(proc);
 	}
 	public void Init__page(String ttl, String txt) {parser_fxt.Init_page_create(ttl, txt);}
@@ -50,17 +50,17 @@ public class Mock_scrib_fxt {
 		engine.InitFunctionForTest(new Mock_exec_module(8, engine));
 		engine.InitFunctionForTest(new Mock_exec_function(9, engine));
 	}
-	public void Init__mock_mod(Scrib_lib lib, String mod_name, Mock_proc_fxt... prc_ary) {
+	public void Init__mock_mod(Scrib_lib lib, String mod_name, Mock_proc_stub... prc_ary) {
 		int mod_id = mock_mod_id_next++;
 		String mod_text = "";
 		engine.Init_module("=" + mod_name, mod_id);
-		for (Mock_proc_fxt prc : prc_ary) {
+		for (Mock_proc_stub prc : prc_ary) {
 			mod_text = mod_text + prc.Key() + "\n";
 			engine.Init_module_func(mod_id, prc);
 		}
 		parser_fxt.Init_page_create(mod_name, mod_text);
 	}
-	public Mock_proc_fxt Init__mock_fnc_for_lib(String fnc_name, Scrib_lib lib, String proc_name, Object... proc_args) {
+	public Mock_proc_stub Init__mock_fnc_for_lib(String fnc_name, Scrib_lib lib, String proc_name, Object... proc_args) {
 		return new Mock_exec_lib(mock_mod_id_next++, fnc_name, lib, proc_name, proc_args);
 	}
 	public void Test__proc__ints      (Scrib_lib lib, String proc_name, Object[] args, int expd)		{Test__proc__kvps(lib, proc_name, Bool_.Y, Int_.To_str(expd), Scrib_kv_utl_.base1_many_(args));}
@@ -112,13 +112,3 @@ class Mock_scrib_fxt_ {
 		return bfr.To_str_and_clear();
 	}
 }
-class Mock_server implements Scrib_server {
-	public void		Init(String... process_args) {}
-	public int		Server_timeout() {return server_timeout;} public Scrib_server Server_timeout_(int v) {server_timeout = v; return this;} private int server_timeout = 60;
-	public int		Server_timeout_polling() {return server_timeout_polling;} public Scrib_server Server_timeout_polling_(int v) {server_timeout_polling = v; return this;} private int server_timeout_polling = 1;
-	public int		Server_timeout_busy_wait() {return server_timeout_busy_wait;} public Scrib_server Server_timeout_busy_wait_(int v) {server_timeout_busy_wait = v; return this;} private int server_timeout_busy_wait = 1;
-	public byte[]	Server_comm(byte[] cmd, Object[] cmd_objs) {return Bry_.Empty;}
-	public void		Server_send(byte[] cmd, Object[] cmd_objs) {}
-	public byte[]	Server_recv() {return Bry_.Empty;}
-	public void		Term() {}
-}