diff --git a/Android.mk b/Android.mk
index 1e894f1f..eafb1fa7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -574,7 +574,7 @@ endif
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libmincrypttwrp
     LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
-    LOCAL_SRC_FILES += oldverifier/verifier.cpp
+    LOCAL_SRC_FILES += verifier24/verifier.cpp
     LOCAL_CFLAGS += -DUSE_OLD_VERIFIER
 else
     LOCAL_SHARED_LIBRARIES += libcrypto
diff --git a/adb_install.cpp b/adb_install.cpp
index a4655dc9..448d6174 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -32,7 +32,7 @@
 #include "minadbd/fuse_adb_provider.h"
 #include "fuse_sideload.h"
 #ifdef USE_OLD_VERIFIER
-#include "oldverifier/verifier.h"
+#include "verifier24/verifier.h"
 #else
 #include "verifier.h"
 #endif
diff --git a/etc/Android.mk b/etc/Android.mk
index 46145778..decd3e2d 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -38,7 +38,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 22; echo $$?),0)
     LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
     LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
-    LOCAL_SRC_FILES := init.recovery.servicenew.rc
+    LOCAL_SRC_FILES := init.recovery.service22.rc
     include $(BUILD_PREBUILT)
 else
     include $(CLEAR_VARS)
@@ -47,7 +47,7 @@ else
     LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
     LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
-    LOCAL_SRC_FILES := init.recovery.serviceold.rc
+    LOCAL_SRC_FILES := init.recovery.service21.rc
     include $(BUILD_PREBUILT)
 endif
 
diff --git a/etc/init.recovery.serviceold.rc b/etc/init.recovery.service21.rc
similarity index 100%
rename from etc/init.recovery.serviceold.rc
rename to etc/init.recovery.service21.rc
diff --git a/etc/init.recovery.servicenew.rc b/etc/init.recovery.service22.rc
similarity index 100%
rename from etc/init.recovery.servicenew.rc
rename to etc/init.recovery.service22.rc
diff --git a/twinstall.cpp b/twinstall.cpp
index 485eb606..c2f98feb 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -33,7 +33,7 @@
 #include "minzip/SysUtil.h"
 #include "minzip/Zip.h"
 #ifdef USE_OLD_VERIFIER
-#include "oldverifier/verifier.h"
+#include "verifier24/verifier.h"
 #else
 #include "verifier.h"
 #endif
diff --git a/verifier24/README b/verifier24/README
new file mode 100644
index 00000000..44d9422e
--- /dev/null
+++ b/verifier24/README
@@ -0,0 +1,2 @@
+This is older code from Android 5.1 Marshmallow (SDK ver 24) and older
+that still used mincrypt instead of libcrypto.
diff --git a/oldverifier/verifier.cpp b/verifier24/verifier.cpp
similarity index 100%
rename from oldverifier/verifier.cpp
rename to verifier24/verifier.cpp
diff --git a/oldverifier/verifier.h b/verifier24/verifier.h
similarity index 100%
rename from oldverifier/verifier.h
rename to verifier24/verifier.h