20 files changed, 31 insertions, 27 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 37c0c97..76a39d7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -155,6 +155,10 @@
 * Rename urch to unrch;
 * Rename ulik to unlik;
 
+* Rename bas module to zp;
+* Rename extver to ext;
+* Rename ver to api;
+
 # 0.0.2
 
 * Migrate to CMake;
diff --git a/zp/GNUmakefile b/zp/GNUmakefile
index f47c06c..f456505 100644
--- a/zp/GNUmakefile
+++ b/zp/GNUmakefile
@@ -21,7 +21,7 @@ ifeq "$(stdcxx)" ""
 stdcxx := c++98
 endif
 
-OBJ_BAS_TRP := source/any/bas/trp.o
+OBJ_BAS_TRP := source/any/zp/trp.o
 
 OBJ_MEM_MEMCPY := source/any/mem/memcpy.o
 OBJ_MEM_MEMEQU := source/any/mem/memequ.o
@@ -62,29 +62,29 @@ OBJ_STR_WSTRFIL := source/any/str/wstrfil.o
 OBJ_STR_WSTRLEN := source/any/str/wstrlen.o
 OBJ_STR_WSTRSRH := source/any/str/wstrsrh.o
 
-OBJ_BAS_SYSCAL := source/any/bas/syscal.o
+OBJ_BAS_SYSCAL := source/any/zp/syscal.o
 
 ifeq "$(targ)" "amd64"
 
-OBJ_BAS_SYSCAL := source/amd64/bas/syscal.o
-OBJ_BAS_TRP := source/amd64/bas/trp.o
+OBJ_BAS_SYSCAL := source/amd64/zp/syscal.o
+OBJ_BAS_TRP := source/amd64/zp/trp.o
 
 OBJ_MEM_MEMCPY := source/amd64/mem/memcpy.o
 OBJ_MEM_MEMFIL := source/amd64/mem/memfil.o
 
 else ifeq "$(targ)" "arm"
 
-OBJ_BAS_SYSCAL := source/arm/bas/syscal.o
+OBJ_BAS_SYSCAL := source/arm/zp/syscal.o
 OBJ_MEM_MEMCPY := source/arm/mem/memcpy.o
 
 else ifeq "$(targ)" "arm64"
 
-OBJ_BAS_SYSCAL := source/arm64/bas/syscal.o
+OBJ_BAS_SYSCAL := source/arm64/zp/syscal.o
 OBJ_MEM_MEMCPY := source/arm64/mem/memcpy.o
 
 else ifeq "$(targ)" "ia32"
 
-OBJ_BAS_SYSCAL := source/ia32/bas/syscal.o
+OBJ_BAS_SYSCAL := source/ia32/zp/syscal.o
 
 endif
 
@@ -143,15 +143,15 @@ LIB := libzp.a
 endif
 
 HDRS := \
- include/zp/bas \
- include/zp/bas.h \
+ include/zp/zp \
+ include/zp/zp.h \
 include/zp/mem \
 include/zp/mem.h \
 include/zp/mth \
 include/zp/mth.h \
 include/zp/str \
 include/zp/str.h \
- include/zp/imp/bas.ii \
+ include/zp/imp/zp.ii \
 include/zp/imp/mem.ii \
 include/zp/imp/mth.ii \
 include/zp/imp/str.ii \
diff --git a/zp/include-private/zp/prv b/zp/include-private/zp/prv
index b79a7b5..6660107 100644
--- a/zp/include-private/zp/prv
+++ b/zp/include-private/zp/prv
@@ -7,7 +7,7 @@
 #ifndef zp_prv_cxxhdr_prv
 #define zp_prv_cxxhdr_prv
 
-#include <zp/bas>
+#include <zp/zp>
 #include <zp/prv.h>
 
 namespace zp {
diff --git a/zp/include-private/zp/prv.h b/zp/include-private/zp/prv.h
index 55e61bf..2d25dc0 100644
--- a/zp/include-private/zp/prv.h
+++ b/zp/include-private/zp/prv.h
@@ -7,7 +7,7 @@
 #ifndef zp_prv_hdr_prv
 #define zp_prv_hdr_prv
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 zp_prv_cdecl
 
diff --git a/zp/include/zp/imp/bas.ii b/zp/include/zp/imp/zp.ii
index ad7c1b6..ad7c1b6 100644
--- a/zp/include/zp/imp/bas.ii
+++ b/zp/include/zp/imp/zp.ii
diff --git a/zp/include/zp/mem b/zp/include/zp/mem
index 0b5427b..ac73262 100644
--- a/zp/include/zp/mem
+++ b/zp/include/zp/mem
@@ -7,7 +7,7 @@
 #ifndef zp_prv_cxxhdr_mem
 #define zp_prv_cxxhdr_mem
 
-#include <zp/bas>
+#include <zp/zp>
 #include <zp/mem.h>
 
 namespace zp {
diff --git a/zp/include/zp/mem.h b/zp/include/zp/mem.h
index 024a062..137bdc8 100644
--- a/zp/include/zp/mem.h
+++ b/zp/include/zp/mem.h
@@ -7,7 +7,7 @@
 #ifndef zp_prv_hdr_mem
 #define zp_prv_hdr_mem
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 zp_prv_cdecl
 
diff --git a/zp/include/zp/mth b/zp/include/zp/mth
index 2dd6ff4..5fce9ec 100644
--- a/zp/include/zp/mth
+++ b/zp/include/zp/mth
@@ -7,7 +7,7 @@
 #ifndef zp_prv_cxxhdr_mth
 #define zp_prv_cxxhdr_mth
 
-#include <zp/bas>
+#include <zp/zp>
 #include <zp/mth.h>
 
 namespace zp {
diff --git a/zp/include/zp/mth.h b/zp/include/zp/mth.h
index 195497a..a6ba22c 100644
--- a/zp/include/zp/mth.h
+++ b/zp/include/zp/mth.h
@@ -7,7 +7,7 @@
 #ifndef zp_prv_hdr_mth
 #define zp_prv_hdr_mth
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 zp_prv_cdecl
 
diff --git a/zp/include/zp/str b/zp/include/zp/str
index 76ede2d..ae9a721 100644
--- a/zp/include/zp/str
+++ b/zp/include/zp/str
@@ -7,7 +7,7 @@
 #ifndef zp_prv_cxxhdr_str
 #define zp_prv_cxxhdr_str
 
-#include <zp/bas>
+#include <zp/zp>
 #include <zp/str.h>
 
 namespace zp {
diff --git a/zp/include/zp/str.h b/zp/include/zp/str.h
index 97b9e17..6fe716a 100644
--- a/zp/include/zp/str.h
+++ b/zp/include/zp/str.h
@@ -7,7 +7,7 @@
 #ifndef zp_prv_hdr_str
 #define zp_prv_hdr_str
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 zp_prv_cdecl
 
diff --git a/zp/include/zp/bas b/zp/include/zp/zp
index 6851f7f..1efbf0e 100644
--- a/zp/include/zp/bas
+++ b/zp/include/zp/zp
@@ -11,7 +11,7 @@
 #error C++ header included from C
 #endif
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 /*
 trtval:
@@ -330,8 +330,8 @@ namespace zp {
 template<typename typ> concept inttyp = ::zp::isinttyp<typ>::val;
 #endif
 
- zp_prv_trtval(::zp::i04m) ver = zp_ver;
- zp_prv_trtval(::zp::i04m) extver = zp_extver;
+ zp_prv_trtval(::zp::i04m) api = zp_api;
+ zp_prv_trtval(::zp::i04m) ext = zp_ext;
 
 zp_prv_trtval(::zp::siz) bytelen = zp_bytelen;
 
@@ -351,6 +351,6 @@ namespace zp {
 #endif
 }
 
-#include <zp/imp/bas.ii>
+#include <zp/imp/zp.ii>
 
 #endif
diff --git a/zp/include/zp/bas.h b/zp/include/zp/zp.h
index 531301e..4b20273 100644
--- a/zp/include/zp/bas.h
+++ b/zp/include/zp/zp.h
@@ -11,7 +11,7 @@
 /*
 Greater Header Dependencies:
 
- bs →┬→ mem
+ zp →┬→ mem
 ├→ mth
 └→ str
 */
@@ -275,8 +275,8 @@ typedef typeof (nullptr) zp_nulptrtyp;
 typedef decltype (nullptr) zp_nulptrtyp;
 #endif
 
-#define zp_ver ((zp_i04m)+0x1u) /* Programs expecting this version will still compile with the current extension version. */
-#define zp_extver ((zp_i04m)+0x0u) /* The extension versions adds functionality without breaking the existing ones. */
+#define zp_api ((zp_i04m)+0x1u) /* Programs expecting this version will still compile with the current extension version. */
+#define zp_ext ((zp_i04m)+0x0u) /* The extension versions adds functionality without breaking the existing ones. */
 /* The patch version is not public as it only changes implementation details. */
 
 #define zp_bytelen ((zp_siz)+0x8u)
diff --git a/zp/source/amd64/bas/syscal.s b/zp/source/amd64/zp/syscal.s
index fac5a6e..fac5a6e 100644
--- a/zp/source/amd64/bas/syscal.s
+++ b/zp/source/amd64/zp/syscal.s
diff --git a/zp/source/amd64/bas/trp.s b/zp/source/amd64/zp/trp.s
index 91efa4e..91efa4e 100644
--- a/zp/source/amd64/bas/trp.s
+++ b/zp/source/amd64/zp/trp.s
diff --git a/zp/source/any/bas/syscal.c b/zp/source/any/zp/syscal.c
index d9c778f..4b35a8d 100644
--- a/zp/source/any/bas/syscal.c
+++ b/zp/source/any/zp/syscal.c
@@ -4,7 +4,7 @@
 If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>.
 */
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 zp_syscalres zp_syscal(zp_nuse zp_syscalidt idt,...) {
 zp_unrch(); /* Unsupported. */
diff --git a/zp/source/any/bas/trp.c b/zp/source/any/zp/trp.c
index f303bf0..0aea358 100644
--- a/zp/source/any/bas/trp.c
+++ b/zp/source/any/zp/trp.c
@@ -4,7 +4,7 @@
 If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>.
 */
 
-#include <zp/bas.h>
+#include <zp/zp.h>
 
 void zp_trp(void) {
 #if zp_prv_hasbltin(__builtin_trap)
diff --git a/zp/source/arm/bas/syscal.s b/zp/source/arm/zp/syscal.s
index 6609332..6609332 100644
--- a/zp/source/arm/bas/syscal.s
+++ b/zp/source/arm/zp/syscal.s
diff --git a/zp/source/arm64/bas/syscal.s b/zp/source/arm64/zp/syscal.s
index b5d928e..b5d928e 100644
--- a/zp/source/arm64/bas/syscal.s
+++ b/zp/source/arm64/zp/syscal.s
diff --git a/zp/source/ia32/bas/syscl.s b/zp/source/ia32/zp/syscl.s
index c482c9d..c482c9d 100644
--- a/zp/source/ia32/bas/syscl.s
+++ b/zp/source/ia32/zp/syscl.s