Rename radare to rizin (#68)

* Rename radare to rizin

- Rename REvent to RzEvent
- Rename RBreakpoint to RzBreakpoint
- Rename RRune to RzRune

* Remove unnecessary files

Dockerfile

@@ -4,12 +4,12 @@
 # Requires 1GB of free disk space
 #
 # Build docker image with:
-# $ docker build -t r2docker:latest .
+# $ docker build -t rizin:latest .
 #
 # Run the docker image:
 # $ docker images
-# $ export DOCKER_IMAGE_ID=$(docker images --format '{{.ID}}' -f 'label=r2docker')
-# $ docker run -ti --cap-drop=ALL r2docker:latest
+# $ export DOCKER_IMAGE_ID=$(docker images --format '{{.ID}}' -f 'label=rizin')
+# $ docker run -ti --cap-drop=ALL rizin:latest
 #
 # Once you quit the bash session get the container id with:
 # $ docker ps -a | grep bash
@@ -24,19 +24,19 @@
 #
 # If you willing to debug a program within Docker, you should run it with CAP_SYS_PTRACE:
 #
-# $ docker run -it --cap-drop=ALL --cap-add=SYS_PTRACE r2docker:latest
-# $ r2 -d /bin/true
+# $ docker run -it --cap-drop=ALL --cap-add=SYS_PTRACE rizin:latest
+# $ rizin -d /bin/true
 #
 
 # Using debian 10 as base image.
 FROM debian:10
 
 # Label base
-LABEL r2docker latest
+LABEL rizin latest
 
 # Radare version
 ARG RZ_VERSION=master
-# R2pipe python version
+# rz-pipe python version
 ARG RZ_PIPE_PY_VERSION=1.4.2
 
 ENV RZ_VERSION ${RZ_VERSION}
@@ -86,19 +86,19 @@ RUN DEBIAN_FRONTEND=noninteractive dpkg --add-architecture i386 && \
   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Create non-root user
-RUN useradd -m r2 && \
-  adduser r2 sudo && \
-  echo "r2:r2" | chpasswd
+RUN useradd -m rizin && \
+  adduser rizin sudo && \
+  echo "rizin:rizin" | chpasswd
 
 # Initilise base user
-USER r2
-WORKDIR /home/r2
-ENV HOME /home/r2
+USER rizin
+WORKDIR /home/rizin
+ENV HOME /home/rizin
 
 # Setup rz-pm
 RUN rz-pm init && \
   rz-pm update && \
-  chown -R r2:r2 /home/r2/.config
+  chown -R rizin:rizin /home/rizin/.config
 
 # Base command for container
 CMD ["/bin/bash"]

Makefile

@@ -384,7 +384,7 @@ shot:
 	${CZ} "rizin-$${DATE}.tar" ;\
 	mv "rizin-$${DATE}" rizin && \
 	scp "rizin-$${DATE}.${TAREXT}" \
-		radare.org:/srv/http/rizinorg/get/shot
+		rizin.org:/srv/http/rizinorg/get/shot
 
 tests:
 	$(MAKE) -C $(RZ_TEST)

README.md

@@ -13,7 +13,7 @@ To learn more on Rizin you may want to read the
 # How to install
 
 You can find the latest release binaries for Android, Debian, Ubuntu, MacOS,
-Windows [here](https://github.com/radareorg/radare2/releases/latest). If we
+Windows [here](https://github.com/rizinorg/rizin/releases/latest). If we
 don't provide a released binary for your system, you can still build Rizin
 yourself.
 

binrz/rizin/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.radare.rizin</string>
+	<string>org.rizin.rizin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

binrz/rizin/Makefile

@@ -7,8 +7,8 @@ BINDEPS+=rz_magic rz_socket rz_flag rz_egg rz_crypto rz_util
 include ../../config-user.mk
 
 # Apple Sign #
-CERTID?=org.radare.rizin
-BUNDLE=org.radare.rizin
+CERTID?=org.rizin.rizin
+BUNDLE=org.rizin.rizin
 MACSDK=macosx10.10
 ENTITL=rizin.xcent
 #ENTITL=rizin_ios.xml
@@ -34,7 +34,7 @@ FOOD_LIBS=$(addprefix ../../librz/,$(subst rz_,,$(BINDEPS)))
 SIGN_LIBS=$(addsuffix /librz_*.dylib,$(FOOD_LIBS))
 
 include ../rules.mk
-#IOS_CERTID?=org.radare.rizin
+#IOS_CERTID?=org.rizin.rizin
 
 ios:
 	$(MAKE) -C ../../librz/io

binrz/rizin/rizin_ios.xml

@@ -29,7 +29,7 @@
 </plist>
 
 <!--
-  This file must be used to 'sign' the 'radare' binary
+  This file must be used to 'sign' the 'rizin' binary
   after compiling to permit debugging on the iphone-os
     $ ldid -Srizin.xml rizin
 -->

binrz/rizin/rizin_macos.xml

@@ -10,6 +10,6 @@
 </plist>
 
 <!--
-  This file must be used to 'sign' the 'radare' binary
+  This file must be used to 'sign' the 'rizin' binary
   after compiling to permit debugging with user perivilage on the macOS
 -->

binrz/rz-gg/shellcodes.c.src

@@ -2,18 +2,18 @@
  * Copyright (C) 2007-2011
  *       pancake <nopcode.org>
  *
- * radare is free software; you can redistribute it and/or modify
+ * rizin is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * radare is distributed in the hope that it will be useful,
+ * rizin is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with radare; if not, write to the Free Software
+ * along with rizin; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */

binrz/rz-pm/rz-pm

@@ -517,7 +517,7 @@ case "$1" in
 	if [ -n "$3" ]; then
 		TRAVIS_JOB="$3"
 	else
-		TRAVIS_JOB=`${CURL} -s https://api.travis-ci.com/repos?slug=radare%2Frizin| jq .[0].last_build_id`
+		TRAVIS_JOB=`${CURL} -s https://api.travis-ci.com/repos?slug=rizin%2Frizin| jq .[0].last_build_id`
 		TRAVIS_JOB=$(($TRAVIS_JOB+1))
 	fi
 	echo $TRAVIS_JOB >&2

doc/fortunes.fun

@@ -100,7 +100,7 @@ Experts agree, security holes suck, and we fixed some of them!
 This is just an existentialist experiment.
 Nothing to see here. Move along.
 Select your character: RBin Wizard, Master Anal Paladin, or Assembly Warrior
-I accidentally radared my filesystem today.
+I accidentally rizind my filesystem today.
 No fix, no sleep
 You see it, you fix it!
 V is for Visual

doc/images/keeprz.svg

@@ -140,7 +140,7 @@
     </g>
     <g
        transform="matrix(0.18440372,0,0,-0.18440372,369.27945,327.20294)"
-       inkscape:label="radare primeros bocetos"
+       inkscape:label="rizin primeros bocetos"
        id="g3012"
        style="fill:#ffffff">
       <g

doc/images/morelogos.svg

@@ -79,7 +79,7 @@
        inkscape:connector-curvature="0" />
     <g
        style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d77e00;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       aria-label="radare"
+       aria-label="rizin"
        id="text4192"
        transform="matrix(2.1597005,0,0,2.1597005,-99.953524,-250.18698)">
       <path

doc/images/rz.svg

@@ -46,7 +46,7 @@
      inkscape:current-layer="g3012" /><g
      id="g3012"
      inkscape:groupmode="layer"
-     inkscape:label="radare primeros bocetos"
+     inkscape:label="rizin primeros bocetos"
      transform="matrix(1.25,0,0,-1.25,0,299.99995)"><g
        id="g4037"
        transform="translate(-574.48081,-692.03162)"><path

doc/images/rzcloud.svg

@@ -51,7 +51,7 @@
        id="guide3865" /></sodipodi:namedview><g
      id="g3012"
      inkscape:groupmode="layer"
-     inkscape:label="radare primeros bocetos"
+     inkscape:label="rizin primeros bocetos"
      transform="matrix(1.25,0,0,-1.25,0,299.99995)"><g
        id="g4037"
        transform="matrix(0.52646936,0,0,0.52646936,-198.78755,-329.13702)"

doc/iphone.md

@@ -99,9 +99,9 @@ Make a fake install in a temporary directory:
 	cd /tmp/r2
 	tar czvpf ../r2.tgz *
 
-Clone the cydia repo from radare's github
+Clone the cydia repo from rizin's github
 
-	git clone https://github.com/radare/cydia
+	git clone https://github.com/rizin/cydia
 	cd cydia/rizin*
 	mkdir root
 	tar xzvf r2.tgz -C root

doc/macos.md

@@ -30,20 +30,20 @@ After Mac OS X 10.6, binaries that need permissions to debug require to be signe
 1. Select the following menu item:
 1. Keychain Access->Certificate Assistant->Create a Certificate...
 1. Set the following settings
-1. Name = org.radare.rizin
+1. Name = org.rizin.rizin
 1. Identity Type = Self Signed Root
 1. Certificate Type = Code Signing
 1. Click Create
 1. Click Continue
 1. Click Done
 1. Click on the "My Certificates"
-1. Double click on your new org.radare.rizin certificate
+1. Double click on your new org.rizin.rizin certificate
 1. Turn down the "Trust" disclosure triangle, scroll to the "Code Signing" trust pulldown menu and select "Always Trust" and authenticate as needed using your username and password.
-1. Drag the new "org.radare.rizin" code signing certificate (not the public or private keys of the same name) from the "login" keychain to the "System" keychain in the Keychains pane on the left hand side of the main Keychain Access window. This will move this certificate to the "System" keychain. You'll have to authorize a few more times, set it to be "Always trusted" when asked.
-1. In the Keychain Access GUI, click and drag "org.radare.rizin" in the "System" keychain onto the desktop. The drag will create a "~/Desktop/org.radare.rizin.cer" file used in the next step.
+1. Drag the new "org.rizin.rizin" code signing certificate (not the public or private keys of the same name) from the "login" keychain to the "System" keychain in the Keychains pane on the left hand side of the main Keychain Access window. This will move this certificate to the "System" keychain. You'll have to authorize a few more times, set it to be "Always trusted" when asked.
+1. In the Keychain Access GUI, click and drag "org.rizin.rizin" in the "System" keychain onto the desktop. The drag will create a "~/Desktop/org.rizin.rizin.cer" file used in the next step.
 1. Switch to Terminal, and run the following:
-1. $ sudo security add-trust -d -r trustRoot -p basic -p codeSign -k /Library/Keychains/System.keychain ~/Desktop/org.radare.rizin.cer
-1. $ rm -f ~/Desktop/org.radare.rizin.cer
+1. $ sudo security add-trust -d -r trustRoot -p basic -p codeSign -k /Library/Keychains/System.keychain ~/Desktop/org.rizin.rizin.cer
+1. $ rm -f ~/Desktop/org.rizin.rizin.cer
 1. Quit Keychain Access
 1. Reboot
 1. Run sys/install.sh (or follow the next steps if you want to install and sign rizin manually)
@@ -89,5 +89,5 @@ Uninstall
 
 To uninstall the .pkg downloaded from the r2 website or the one you have generated with `sys/osx-pkg.sh`, run the following as root:
 
-	$ pkgutil --only-files --files org.radare.rizin | sed 's/^/\//' | tr '\n' '\0' | xargs -o -n 1 -0 rm -i
+	$ pkgutil --only-files --files org.rizin.rizin | sed 's/^/\//' | tr '\n' '\0' | xargs -o -n 1 -0 rm -i
 

doc/newshell.md

@@ -70,7 +70,7 @@ deregister it, call the right command descriptor handler based on a list of
 command name + arguments, get the help of a command and potentially do many
 other things.
 
-As radare2/rizin commands mainly form a tree, `RzCmdDesc` are organized in a
+As rizin/radare2 commands mainly form a tree, `RzCmdDesc` are organized in a
 tree, with each descriptor having references to its parent and its children.
 Moreover, a descriptor has its help messages and its handler.
 

doc/rap.md

@@ -1,7 +1,7 @@
 RAP protocol
 ============
 
-RAP stands for the Remote Access Protocol of Radare2, it is compatible with radare1
+RAP stands for the Remote Access Protocol of Radare2, it is compatible with rizin1
 and it simply defines a communication between a client and a server to simulate IO
 operations.
 

librz/anal/anal.c

@@ -25,35 +25,35 @@ RZ_API void rz_anal_unset_limits(RzAnal *anal) {
 	RZ_FREE (anal->limit);
 }
 
-static void meta_unset_for(REvent *ev, int type, void *user, void *data) {
+static void meta_unset_for(RzEvent *ev, int type, void *user, void *data) {
 	RSpaces *s = (RSpaces *)ev->user;
 	RzAnal *anal = container_of (s, RzAnal, meta_spaces);
 	RSpaceEvent *se = (RSpaceEvent *)data;
 	rz_meta_space_unset_for (anal, se->data.unset.space);
 }
 
-static void meta_count_for(REvent *ev, int type, void *user, void *data) {
+static void meta_count_for(RzEvent *ev, int type, void *user, void *data) {
 	RSpaces *s = (RSpaces *)ev->user;
 	RzAnal *anal = container_of (s, RzAnal, meta_spaces);
 	RSpaceEvent *se = (RSpaceEvent *)data;
 	se->res = rz_meta_space_count_for (anal, se->data.count.space);
 }
 
-static void zign_unset_for(REvent *ev, int type, void *user, void *data) {
+static void zign_unset_for(RzEvent *ev, int type, void *user, void *data) {
 	RSpaces *s = (RSpaces *)ev->user;
 	RzAnal *anal = container_of (s, RzAnal, zign_spaces);
 	RSpaceEvent *se = (RSpaceEvent *)data;
 	rz_sign_space_unset_for (anal, se->data.unset.space);
 }
 
-static void zign_count_for(REvent *ev, int type, void *user, void *data) {
+static void zign_count_for(RzEvent *ev, int type, void *user, void *data) {
 	RSpaces *s = (RSpaces *)ev->user;
 	RzAnal *anal = container_of (s, RzAnal, zign_spaces);
 	RSpaceEvent *se = (RSpaceEvent *)data;
 	se->res = rz_sign_space_count_for (anal, se->data.count.space);
 }
 
-static void zign_rename_for(REvent *ev, int type, void *user, void *data) {
+static void zign_rename_for(RzEvent *ev, int type, void *user, void *data) {
 	RSpaces *s = (RSpaces *)ev->user;
 	RzAnal *anal = container_of (s, RzAnal, zign_spaces);
 	RSpaceEvent *se = (RSpaceEvent *)data;

librz/anal/class.c

@@ -62,7 +62,7 @@ RZ_API void rz_anal_class_create(RzAnal *anal, const char *name) {
 		sdb_set (anal->sdb_classes, key, "c", 0);
 	}
 
-	REventClass event = { .name = name_sanitized };
+	RzEventClass event = { .name = name_sanitized };
 	rz_event_send (anal->ev, RZ_EVENT_CLASS_NEW, &event);
 
 	free (name_sanitized);
@@ -109,7 +109,7 @@ RZ_API void rz_anal_class_delete(RzAnal *anal, const char *name) {
 
 	sdb_remove (anal->sdb_classes_attrs, key_attr_types (class_name_sanitized), 0);
 
-	REventClass event = { .name = class_name_sanitized };
+	RzEventClass event = { .name = class_name_sanitized };
 	rz_event_send (anal->ev, RZ_EVENT_CLASS_DEL, &event);
 
 	free (class_name_sanitized);
@@ -195,7 +195,7 @@ RZ_API RzAnalClassErr rz_anal_class_rename(RzAnal *anal, const char *old_name, c
 
 	rename_key (anal->sdb_classes_attrs, key_attr_types (old_name_sanitized), key_attr_types (new_name_sanitized));
 
-	REventClassRename event = {
+	RzEventClassRename event = {
 		.name_old = old_name_sanitized,
 		.name_new = new_name_sanitized
 	};
@@ -249,7 +249,7 @@ static RzAnalClassErr rz_anal_class_set_attr_raw(RzAnal *anal, const char *class
 	sdb_array_add (anal->sdb_classes_attrs, key_attr_type_attrs (class_name, attr_type_str), attr_id, 0);
 	sdb_set (anal->sdb_classes_attrs, key_attr_content (class_name, attr_type_str, attr_id), content, 0);
 
-	REventClassAttrSet event = {
+	RzEventClassAttrSet event = {
 		.attr = {
 			.class_name = class_name,
 			.attr_type = attr_type,
@@ -297,7 +297,7 @@ static RzAnalClassErr rz_anal_class_delete_attr_raw(RzAnal *anal, const char *cl
 		sdb_array_remove (anal->sdb_classes_attrs, key_attr_types (class_name), attr_type_str, 0);
 	}
 
-	REventClassAttr event = {
+	RzEventClassAttr event = {
 		.class_name = class_name,
 		.attr_type = attr_type,
 		.attr_id = attr_id
@@ -358,7 +358,7 @@ static RzAnalClassErr rz_anal_class_rename_attr_raw(RzAnal *anal, const char *cl
 		free (content);
 	}
 
-	REventClassAttrRename event = {
+	RzEventClassAttrRename event = {
 		.attr = {
 			.class_name = class_name,
 			.attr_type = attr_type,

librz/anal/meson.build

@@ -209,5 +209,5 @@ pkgconfig_mod.generate(rz_anal,
     'rz_cons',
     'rz_flag'
   ],
-  description: 'radare foundation libraries'
+  description: 'rizin foundation libraries'
 )

librz/anal/p/anal_6502.c

@@ -962,7 +962,7 @@ RzAnalPlugin rz_anal_plugin_6502 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_6502,
 	.version = RZ_VERSION

librz/anal/p/anal_6502_cs.c

@@ -204,7 +204,7 @@ RzAnalPlugin rz_anal_plugin_6502_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_6502_cs,
 	.version = RZ_VERSION
@@ -221,7 +221,7 @@ RzAnalPlugin rz_anal_plugin_6502_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.version = RZ_VERSION
 };

librz/anal/p/anal_8051.c

@@ -1047,7 +1047,7 @@ RzAnalPlugin rz_anal_plugin_8051 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_8051,
 	.version = RZ_VERSION

librz/anal/p/anal_amd29k.c

@@ -334,7 +334,7 @@ RzAnalPlugin rz_anal_plugin_amd29k = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_amd29k,
 	.version = RZ_VERSION

librz/anal/p/anal_arc.c

@@ -66,7 +66,7 @@ static int sex(int bits, int imm) {
 #define SEX_S21(imm) sex (21, imm);
 #define SEX_S25(imm) sex (25, imm);
 
-static int map_cond2radare(ut8 cond) {
+static int map_cond2rizin(ut8 cond) {
 	switch (cond) {
 	case 0: return RZ_ANAL_COND_AL;
 	case 1: return RZ_ANAL_COND_EQ;
@@ -83,7 +83,7 @@ static int map_cond2radare(ut8 cond) {
 	case 0xe: return RZ_ANAL_COND_LS;
 #if 0
 	/* TODO: */
-	/* - radare defines RZ_ANAL_COND_LO as carry clear and _HS as carry set */
+	/* - rizin defines RZ_ANAL_COND_LO as carry clear and _HS as carry set */
 	/*   which appears different to the ARC definitions. */
 	/*   Need to do some math and double check the details */
 	case 5: return RZ_ANAL_COND_?? - CS,C,LO - Carry set & LO
@@ -103,7 +103,7 @@ static void arcompact_jump(RzAnalOp *op, ut64 addr, ut64 jump, ut8 delay) {
 
 static void arcompact_jump_cond(RzAnalOp *op, ut64 addr, ut64 jump, ut8 delay, ut8 cond) {
 	arcompact_jump (op, addr, jump, delay);
-	op->cond = map_cond2radare (cond);
+	op->cond = map_cond2rizin (cond);
 }
 
 static void arcompact_branch(RzAnalOp *op, ut64 addr, st64 offset, ut8 delay) {
@@ -181,12 +181,12 @@ static int arcompact_genops_jmp(RzAnalOp *op, ut64 addr, arc_fields *f, ut64 bas
 				/* ilink1, ilink2, blink */
 				/* Note: not valid for basic_type == CALL */
 				op->type = RZ_ANAL_OP_TYPE_CRET;
-				op->cond = map_cond2radare (f->cond);
+				op->cond = map_cond2rizin (f->cond);
 				op->delay = f->mode_n;
 				return op->size;
 			}
 
-			op->cond = map_cond2radare (f->cond);
+			op->cond = map_cond2rizin (f->cond);
 			op->type = type_ucjmp;
 			return op->size;
 		}
@@ -279,7 +279,7 @@ static int arcompact_genops(RzAnalOp *op, ut64 addr, ut32 words[2]) {
 			op->val = SEX_S12 (fields.a << 6 | fields.c);
 		} else if (fields.format == 3) {
 			fields.cond = fields.a & 0x1f;
-			op->cond = map_cond2radare (fields.cond);
+			op->cond = map_cond2rizin (fields.cond);
 			op->type = RZ_ANAL_OP_TYPE_CMOV;
 			if ((fields.a & 0x20)) {
 				/* its a move from imm u6 */
@@ -337,7 +337,7 @@ static int arcompact_genops(RzAnalOp *op, ut64 addr, ut32 words[2]) {
 		break;
 	case 0x28: /* loop (16-bit aligned target address) */
 		/* this is essentially a COME FROM instruction!! */
-		/* TODO: describe it to radare better? */
+		/* TODO: describe it to rizin better? */
 		switch (fields.format) {
 		case 2: /* Loop Set Up (Unconditional) */
 			fields.imm = SEX_S13 ((fields.c | (fields.a << 6)) << 1);
@@ -348,7 +348,7 @@ static int arcompact_genops(RzAnalOp *op, ut64 addr, ut32 words[2]) {
 		case 3: /* Loop Set Up (Conditional) */
 			fields.imm = fields.c << 1;
 			fields.cond = fields.a & 0x1f;
-			op->cond = map_cond2radare (fields.a & 0x1f);
+			op->cond = map_cond2rizin (fields.a & 0x1f);
 			op->jump = (addr & ~3) + fields.imm;
 			op->type = RZ_ANAL_OP_TYPE_CJMP;
 			op->fail = addr + op->size;
@@ -498,7 +498,7 @@ static int arcompact_op(RzAnal *anal, RzAnalOp *op, ut64 addr, const ut8 *data,
 			/* Branch Conditionally 0x00 [0x0] */
 			fields.limm = SEX_S21 (fields.limm);
 			fields.cond = (words[0] & 0x1f);
-			op->cond = map_cond2radare (fields.cond);
+			op->cond = map_cond2rizin (fields.cond);
 			op->type = RZ_ANAL_OP_TYPE_CJMP;
 		} else {
 			/* Branch Unconditional Far 0x00 [0x1] */
@@ -545,7 +545,7 @@ static int arcompact_op(RzAnal *anal, RzAnalOp *op, ut64 addr, const ut8 *data,
 				/* Branch and Link Conditionally, 0x01, [0x0, 0x0] */
 				fields.imm = SEX_S21 (fields.imm);
 				fields.cond = (words[0] & 0x1f);
-				op->cond = map_cond2radare (fields.cond);
+				op->cond = map_cond2rizin (fields.cond);
 				op->type = RZ_ANAL_OP_TYPE_CCALL;
 			} else {
 				/* Branch and Link Unconditional Far, 0x01, [0x0, 0x1] */
@@ -840,7 +840,7 @@ static int arcompact_op(RzAnal *anal, RzAnalOp *op, ut64 addr, const ut8 *data,
 			op->type = RZ_ANAL_OP_TYPE_TRAP;
 			/* TODO: the description sounds more like a */
 			/* RZ_ANAL_OP_TYPE_SWI, but I don't know what */
-			/* difference that would make to radare */
+			/* difference that would make to rizin */
 			break;
 		case 0x1f:
 			op->type = RZ_ANAL_OP_TYPE_TRAP;
@@ -1149,7 +1149,7 @@ RzAnalPlugin rz_anal_plugin_arc = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_arc,
 	.version = RZ_VERSION,

librz/anal/p/anal_arm_cs.c

@@ -4375,7 +4375,7 @@ RzAnalPlugin rz_anal_plugin_arm_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_arm_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_arm_gnu.c

@@ -283,7 +283,7 @@ static int arm_op32(RzAnal *anal, RzAnalOp *op, ut64 addr, const ut8 *data, int
 			// var_add_access(addr, -b[0], 1, 0); // TODO: set/get (the last 0)
 		} else {
 			// ut32 oaddr = addr+8+b[0];
-			// XXX TODO ret = radare_read_at(oaddr, (ut8*)&ptr, 4);
+			// XXX TODO ret = rizin_read_at(oaddr, (ut8*)&ptr, 4);
 			if (anal->bits == 32) {
 				b = (ut8 *) &ptr;
 				op->ptr = b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24);
@@ -474,7 +474,7 @@ RzAnalPlugin rz_anal_plugin_arm_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_arm_gnu,
 	.version = RZ_VERSION

librz/anal/p/anal_avr.c

@@ -2108,7 +2108,7 @@ RzAnalPlugin rz_anal_plugin_avr = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_avr,
 	.version = RZ_VERSION

librz/anal/p/anal_bf.c

@@ -157,7 +157,7 @@ RzAnalPlugin rz_anal_plugin_bf = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_bf,
 	.version = RZ_VERSION

librz/anal/p/anal_chip8.c

@@ -160,7 +160,7 @@ RzAnalPlugin rz_anal_plugin_chip8 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_chip8,
 	.version = RZ_VERSION

librz/anal/p/anal_cr16.c

@@ -128,7 +128,7 @@ RzAnalPlugin rz_anal_plugin_cr16 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_cr16,
 	.version = RZ_VERSION

librz/anal/p/anal_cris.c

@@ -286,7 +286,7 @@ RzAnalPlugin rz_anal_plugin_cris = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_cris,
 	.version = RZ_VERSION

librz/anal/p/anal_dalvik.c

@@ -766,7 +766,7 @@ RzAnalPlugin rz_anal_plugin_dalvik = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_dalvik,
 	.version = RZ_VERSION

librz/anal/p/anal_ebc.c

@@ -171,7 +171,7 @@ RzAnalPlugin rz_anal_plugin_ebc = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_ebc,
 	.version = RZ_VERSION

librz/anal/p/anal_gb.c

@@ -1578,7 +1578,7 @@ RzAnalPlugin rz_anal_plugin_gb = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_gb,
 	.version = RZ_VERSION

librz/anal/p/anal_h8300.c

@@ -733,7 +733,7 @@ RzAnalPlugin rz_anal_plugin_h8300 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-struct rz_lib_struct_t radare_plugin = {
+struct rz_lib_struct_t rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_h8300,
 	.version = RZ_VERSION

librz/anal/p/anal_hexagon.c

@@ -101,7 +101,7 @@ RzAnalPlugin rz_anal_plugin_hexagon = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_hexagon_v6,
 	.version = RZ_VERSION

librz/anal/p/anal_i4004.c

@@ -213,7 +213,7 @@ RzAnalPlugin rz_anal_plugin_i4004 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_i4004,
 	.version = RZ_VERSION

librz/anal/p/anal_i8080.c

@@ -197,7 +197,7 @@ RzAnalPlugin rz_anal_plugin_i8080 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_i8080,
 	.version = RZ_VERSION

librz/anal/p/anal_java.c

@@ -345,7 +345,7 @@ RzAnalPlugin rz_anal_plugin_java = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_java,
 	.version = RZ_VERSION

librz/anal/p/anal_m680x_cs.c

@@ -549,7 +549,7 @@ RzAnalPlugin rz_anal_plugin_m680x_cs = {
 #endif
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_m680x_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_m68k_cs.c

@@ -781,7 +781,7 @@ RzAnalPlugin rz_anal_plugin_m68k_cs = {
 #endif
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_m68k_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_malbolge.c

@@ -46,7 +46,7 @@ RzAnalPlugin rz_anal_plugin_malbolge = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_malbolge,
 	.version = RZ_VERSION

librz/anal/p/anal_mcore.c

@@ -125,7 +125,7 @@ RzAnalPlugin rz_anal_plugin_mcore = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_mcore,
 	.version = RZ_VERSION

librz/anal/p/anal_mips_cs.c

@@ -1228,7 +1228,7 @@ RzAnalPlugin rz_anal_plugin_mips_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_mips_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_mips_gnu.c

@@ -1787,7 +1787,7 @@ RzAnalPlugin rz_anal_plugin_mips_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
         .type = RZ_LIB_TYPE_ANAL,
         .data = &rz_anal_plugin_mips_gnu
 };

librz/anal/p/anal_nios2.c

@@ -97,7 +97,7 @@ RzAnalPlugin rz_anal_plugin_nios2 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_nios2,
 	.version = RZ_VERSION

librz/anal/p/anal_null.c

@@ -24,7 +24,7 @@ RzAnalPlugin rz_anal_plugin_null = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_null,
 	.version = RZ_VERSION

librz/anal/p/anal_or1k.c

@@ -197,7 +197,7 @@ RzAnalPlugin rz_anal_plugin_or1k = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_or1k,
 	.version = RZ_VERSION

librz/anal/p/anal_pic.c

@@ -1194,7 +1194,7 @@ RzAnalPlugin rz_anal_plugin_pic = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_pic,
 	.version = RZ_VERSION

librz/anal/p/anal_ppc_cs.c

@@ -1282,7 +1282,7 @@ RzAnalPlugin rz_anal_plugin_ppc_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_ppc_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_ppc_gnu.c

@@ -152,7 +152,7 @@ RzAnalPlugin rz_anal_plugin_ppc_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_ppc_gnu,
 	.version = RZ_VERSION

librz/anal/p/anal_pyc.c

@@ -148,7 +148,7 @@ RzAnalPlugin rz_anal_plugin_pyc = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_pyc,
 	.version = RZ_VERSION

librz/anal/p/anal_riscv.c

@@ -834,7 +834,7 @@ RzAnalPlugin rz_anal_plugin_riscv = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_riscv,
 	.version = RZ_VERSION

librz/anal/p/anal_riscv_cs.c

@@ -602,7 +602,7 @@ RzAnalPlugin rz_anal_plugin_riscv_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_riscv_cs,
 	.version = RZ_VERSION
@@ -612,7 +612,7 @@ RZ_API RzLibStruct radare_plugin = {
 #else
 RzAnalPlugin rz_anal_plugin_riscv_cs = {0};
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.version = RZ_VERSION
 };

librz/anal/p/anal_rsp.c

@@ -699,7 +699,7 @@ RzAnalPlugin rz_anal_plugin_rsp = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_rsp,
 	.version = RZ_VERSION

librz/anal/p/anal_sh.c

@@ -1168,7 +1168,7 @@ RzAnalPlugin rz_anal_plugin_sh = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_sh,
 	.version = RZ_VERSION

librz/anal/p/anal_snes.c

@@ -264,7 +264,7 @@ RzAnalPlugin rz_anal_plugin_snes = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_snes,
 	.version = RZ_VERSION

librz/anal/p/anal_sparc_cs.c

@@ -393,7 +393,7 @@ RzAnalPlugin rz_anal_plugin_sparc_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_sparc_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_sparc_gnu.c

@@ -468,7 +468,7 @@ static bool set_reg_profile(RzAnal *anal) {
 	/* As far as I can see, sparc v9 register and instruction set
 	   don't depened  on bits of the running application.
 	   But: They depend on the bits of the consuming application,
-	   that is the bits radare had been compiled with.
+	   that is the bits rizin had been compiled with.
 	   See sys/procfs_isa.h on a Solaris10 Sparc machine and
 	   'man 4 core' for reference.
 	 */
@@ -619,7 +619,7 @@ RzAnalPlugin rz_anal_plugin_sparc_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_sparc_gnu,
 	.version = RZ_VERSION

librz/anal/p/anal_sysz.c

@@ -205,7 +205,7 @@ RzAnalPlugin rz_anal_plugin_sysz = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_sysz,
 	.version = RZ_VERSION

librz/anal/p/anal_tms320.c

@@ -120,7 +120,7 @@ RzAnalPlugin rz_anal_plugin_tms320 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_tms320,
 	.version = RZ_VERSION

librz/anal/p/anal_tms320c64x.c

@@ -209,7 +209,7 @@ RzAnalPlugin rz_anal_plugin_tms320c64x = {
 #endif
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_tms320c64x,
 	.version = RZ_VERSION

librz/anal/p/anal_tricore.c

@@ -83,7 +83,7 @@ RzAnalPlugin rz_anal_plugin_tricore = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_tricore,
 	.version = RZ_VERSION

librz/anal/p/anal_v810.c

@@ -455,7 +455,7 @@ RzAnalPlugin rz_anal_plugin_v810 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_v810,
 	.version = RZ_VERSION

librz/anal/p/anal_v850.c

@@ -561,7 +561,7 @@ RzAnalPlugin rz_anal_plugin_v850 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_v850,
 	.version = RZ_VERSION

librz/anal/p/anal_vax.c

@@ -96,7 +96,7 @@ RzAnalPlugin rz_anal_plugin_vax = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_vax,
 	.version = RZ_VERSION

librz/anal/p/anal_wasm.c

@@ -468,7 +468,7 @@ RzAnalPlugin rz_anal_plugin_wasm = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_wasm,
 	.version = RZ_VERSION

librz/anal/p/anal_ws.c

@@ -129,7 +129,7 @@ RzAnalPlugin rz_anal_plugin_ws = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_ws,
 	.version = RZ_VERSION

librz/anal/p/anal_x86_cs.c

@@ -3790,7 +3790,7 @@ RzAnalPlugin rz_anal_plugin_x86_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_x86_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_xap.c

@@ -219,7 +219,7 @@ RzAnalPlugin rz_anal_plugin_xap = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_xap,
 	.version = RZ_VERSION

librz/anal/p/anal_xcore_cs.c

@@ -134,7 +134,7 @@ RzAnalPlugin rz_anal_plugin_xcore_cs = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_xcore_cs,
 	.version = RZ_VERSION

librz/anal/p/anal_xtensa.c

@@ -2032,7 +2032,7 @@ RzAnalPlugin rz_anal_plugin_xtensa = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_xtensa,
 	.version = RZ_VERSION

librz/anal/p/anal_z80.c

@@ -425,7 +425,7 @@ RzAnalPlugin rz_anal_plugin_z80 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ANAL,
 	.data = &rz_anal_plugin_z80,
 	.version = RZ_VERSION

librz/anal/sign.c

@@ -1933,7 +1933,7 @@ static bool listCB(void *user, const char *k, const char *v) {
 		pj_o (ctx->pj);
 	}
 
-	// Zignspace and name (except for radare format)
+	// Zignspace and name (except for rizin format)
 	if (ctx->format == '*') {
 		if (it->space) {
 			a->cb_printf ("zs %s\n", it->space->name);

librz/asm/meson.build

@@ -249,5 +249,5 @@ pkgconfig_mod.generate(rz_asm,
     'rz_flag',
     'rz_socket'
   ],
-  description: 'radare foundation libraries'
+  description: 'rizin foundation libraries'
 )

librz/asm/p/asm_6502.c

@@ -23,7 +23,7 @@ RzAsmPlugin rz_asm_plugin_6502 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_6502,
 	.version = RZ_VERSION

librz/asm/p/asm_6502_cs.c

@@ -81,7 +81,7 @@ RzAsmPlugin rz_asm_plugin_6502_cs = {
 #endif
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_6502_cs,
 	.version = RZ_VERSION

librz/asm/p/asm_8051.c

@@ -40,7 +40,7 @@ RzAsmPlugin rz_asm_plugin_8051 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_8051,
 	.version = RZ_VERSION

librz/asm/p/asm_amd29k.c

@@ -37,7 +37,7 @@ RzAsmPlugin rz_asm_plugin_amd29k = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_amd29k,
 	.version = RZ_VERSION

librz/asm/p/asm_arc.c

@@ -91,7 +91,7 @@ RzAsmPlugin rz_asm_plugin_arc = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_arc,
 	.version = RZ_VERSION

librz/asm/p/asm_arm_as.c

@@ -116,7 +116,7 @@ RzAsmPlugin rz_asm_plugin_arm_as = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_arm_as,
 	.version = RZ_VERSION

librz/asm/p/asm_arm_cs.c

@@ -314,7 +314,7 @@ RzAsmPlugin rz_asm_plugin_arm_cs = {
 
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_arm_cs,
 	.version = RZ_VERSION

librz/asm/p/asm_arm_gnu.c

@@ -218,7 +218,7 @@ RzAsmPlugin rz_asm_plugin_arm_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_arm_gnu,
 	.version = RZ_VERSION

librz/asm/p/asm_arm_winedbg.c

@@ -44,7 +44,7 @@ RzAsmPlugin rz_asm_plugin_arm_winedbg = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_arm_winedbg,
 	.version = RZ_VERSION

librz/asm/p/asm_avr.c

@@ -39,7 +39,7 @@ typedef struct _specialregs specialregs;
 
 #define REGS_TABLE 9
 
-// radare tolower instruction in rasm, so we use 'x' instead of 'X' etc.
+// rizin tolower instruction in rasm, so we use 'x' instead of 'X' etc.
 specialregs RegsTable[REGS_TABLE] = {
 	{"-x", OPERAND_XP}, {"x", OPERAND_X}, {"x+", OPERAND_XP},
 	{"-y", OPERAND_YP}, {"y", OPERAND_Y}, {"y+", OPERAND_YP},
@@ -57,7 +57,7 @@ static int parse_specialreg(const char *reg) {
 				break;
 			}
 		}
-		/* radare tolower instruction in rasm, so we use 'y' instead of 'Y'
+		/* rizin tolower instruction in rasm, so we use 'y' instead of 'Y'
 		and so on for other registers */
 		if (found == -1 && reg[1] == '+') {
 			if (reg[0] == 'y' && len > 2) {
@@ -417,7 +417,7 @@ static int assemble(RzAsm *a, RzAsmOp *ao, const char *str) {
 		}
 	}
 
-	// copying result to radare struct
+	// copying result to rizin struct
 	if (len > 0) {
 		rz_strbuf_setbin (&ao->buf, (const ut8*)&coded, len);
 	}
@@ -450,7 +450,7 @@ RzAsmPlugin rz_asm_plugin_avr = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_avr,
 	.version = RZ_VERSION

librz/asm/p/asm_bf.c

@@ -133,7 +133,7 @@ RzAsmPlugin rz_asm_plugin_bf = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_bf,
 	.version = RZ_VERSION

librz/asm/p/asm_chip8.c

@@ -95,7 +95,7 @@ RzAsmPlugin rz_asm_plugin_chip8 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_chip8,
 	.version = RZ_VERSION

librz/asm/p/asm_cr16.c

@@ -25,7 +25,7 @@ RzAsmPlugin rz_asm_plugin_cr16 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_cr16,
 	.version = RZ_VERSION

librz/asm/p/asm_cris_gnu.c

@@ -133,7 +133,7 @@ RzAsmPlugin rz_asm_plugin_cris_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_cris_gnu,
 	.version = RZ_VERSION

librz/asm/p/asm_dalvik.c

@@ -559,7 +559,7 @@ RzAsmPlugin rz_asm_plugin_dalvik = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_dalvik,
 	.version = RZ_VERSION

librz/asm/p/asm_dcpu16.c

@@ -39,7 +39,7 @@ RzAsmPlugin rz_asm_plugin_dcpu16 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_dcpu16,
 	.version = RZ_VERSION

librz/asm/p/asm_ebc.c

@@ -28,7 +28,7 @@ RzAsmPlugin rz_asm_plugin_ebc = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_ebc,
 	.version = RZ_VERSION

librz/asm/p/asm_gas.c

@@ -32,7 +32,7 @@ RzAsmPlugin rz_asm_plugin_x86_gas = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_x86_gas,
 	.version = RZ_VERSION

librz/asm/p/asm_gb.c

@@ -31,7 +31,7 @@ RzAsmPlugin rz_asm_plugin_gb = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_gb,
 	.version = RZ_VERSION

librz/asm/p/asm_h8300.c

@@ -25,7 +25,7 @@ RzAsmPlugin rz_asm_plugin_h8300 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_h8300,
 	.version = RZ_VERSION

librz/asm/p/asm_hexagon.c

@@ -26,7 +26,7 @@ RzAsmPlugin rz_asm_plugin_hexagon = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_hexagon
 };

librz/asm/p/asm_hppa_gnu.c

@@ -81,7 +81,7 @@ RzAsmPlugin rz_asm_plugin_hppa_gnu = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_hppa_gnu,
 	.version = RZ_VERSION

librz/asm/p/asm_i4004.c

@@ -21,7 +21,7 @@ RzAsmPlugin rz_asm_plugin_i4004 = {
 };
 
 #ifndef RZ_PLUGIN_INCORE
-RZ_API RzLibStruct radare_plugin = {
+RZ_API RzLibStruct rizin_plugin = {
 	.type = RZ_LIB_TYPE_ASM,
 	.data = &rz_asm_plugin_i4004,
 	.version = RZ_VERSION