diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7dd9d8..9108801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,20 +28,20 @@ if(NOT WIN32)
 	option(USE_NEON "enable NEON" OFF)
 endif()
 
-set(ARIB25_LIB_NAME "arib25")
-set(ARIB25_CMD_NAME "b25")
+set(ARIBB25_LIB_NAME "aribb25")
+set(ARIBB25_CMD_NAME "b25")
 
-set(ARIB25_URL "https://github.com/stz2012/libarib25")
-set(ARIB25_DESCRIPTION "Reference implementation of ARIB STD-B25")
-set(ARIB25_COMPANY "㋲製作所")
-set(ARIB25_COPYRIGHT "©2012 茂木 和洋")
-set(ARIB25_PRODUCT "ARIB STD-B25")
+set(ARIBB25_URL "https://github.com/tsukumijima/libaribb25")
+set(ARIBB25_DESCRIPTION "Reference implementation of ARIB STD-B25")
+set(ARIBB25_COMPANY "㋲製作所")
+set(ARIBB25_COPYRIGHT "©2012 茂木 和洋")
+set(ARIBB25_PRODUCT "ARIB STD-B25")
 
-set(ARIB25_MAJOR_VERSION "0")
-set(ARIB25_MINOR_VERSION "2")
-set(ARIB25_PATCH_VERSION "5")
-set(ARIB25_VERSION_NUMBER ${ARIB25_MAJOR_VERSION}.${ARIB25_MINOR_VERSION}.${ARIB25_PATCH_VERSION})
-set(ARIB25_VERSION_STRING stz-${ARIB25_VERSION_NUMBER})
+set(ARIBB25_MAJOR_VERSION "0")
+set(ARIBB25_MINOR_VERSION "2")
+set(ARIBB25_PATCH_VERSION "7")
+set(ARIBB25_VERSION_NUMBER ${ARIBB25_MAJOR_VERSION}.${ARIBB25_MINOR_VERSION}.${ARIBB25_PATCH_VERSION})
+set(ARIBB25_VERSION_STRING stz-${ARIBB25_VERSION_NUMBER})
 
 if(CMAKE_C_COMPILER_ID MATCHES "(GNU|Clang)")
 	set(CMAKE_C_FLAGS "-Wall")
@@ -103,44 +103,44 @@ if(PCSC_INCLUDE_DIRS)
 endif()
 link_directories(${PCSC_LIBRARY_DIRS})
 
-add_library(arib25-objlib OBJECT src/arib_std_b25.c src/b_cas_card.c src/multi2.cc src/ts_section_parser.c src/version.c)
-set_target_properties(arib25-objlib PROPERTIES COMPILE_DEFINITIONS ARIB25_DLL)
+add_library(aribb25-objlib OBJECT src/arib_std_b25.c src/b_cas_card.c src/multi2.cc src/ts_section_parser.c src/version.c)
+set_target_properties(aribb25-objlib PROPERTIES COMPILE_DEFINITIONS ARIBB25_DLL)
 
-add_library(arib25-static STATIC $<TARGET_OBJECTS:arib25-objlib>)
-set_target_properties(arib25-static PROPERTIES OUTPUT_NAME ${ARIB25_LIB_NAME})
-target_link_libraries(arib25-static PRIVATE ${PCSC_LIBRARIES})
+add_library(aribb25-static STATIC $<TARGET_OBJECTS:aribb25-objlib>)
+set_target_properties(aribb25-static PROPERTIES OUTPUT_NAME ${ARIBB25_LIB_NAME})
+target_link_libraries(aribb25-static PRIVATE ${PCSC_LIBRARIES})
 
-add_library(arib25-shared SHARED $<TARGET_OBJECTS:arib25-objlib> ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-set_target_properties(arib25-shared PROPERTIES MACOSX_RPATH ON)
-set_target_properties(arib25-shared PROPERTIES DEFINE_SYMBOL ARIB25_DLL)
-set_target_properties(arib25-shared PROPERTIES COMPILE_DEFINITIONS ARIB25_DLL)
-set_target_properties(arib25-shared PROPERTIES OUTPUT_NAME ${ARIB25_LIB_NAME})
-set_target_properties(arib25-shared PROPERTIES SOVERSION ${ARIB25_MAJOR_VERSION})
-set_target_properties(arib25-shared PROPERTIES VERSION ${ARIB25_VERSION_NUMBER})
-target_link_libraries(arib25-shared PRIVATE ${PCSC_LIBRARIES})
-generate_export_header(arib25-shared BASE_NAME arib25_api EXPORT_FILE_NAME arib25_api.h)
+add_library(aribb25-shared SHARED $<TARGET_OBJECTS:aribb25-objlib> ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+set_target_properties(aribb25-shared PROPERTIES MACOSX_RPATH ON)
+set_target_properties(aribb25-shared PROPERTIES DEFINE_SYMBOL ARIBB25_DLL)
+set_target_properties(aribb25-shared PROPERTIES COMPILE_DEFINITIONS ARIBB25_DLL)
+set_target_properties(aribb25-shared PROPERTIES OUTPUT_NAME ${ARIBB25_LIB_NAME})
+set_target_properties(aribb25-shared PROPERTIES SOVERSION ${ARIBB25_MAJOR_VERSION})
+set_target_properties(aribb25-shared PROPERTIES VERSION ${ARIBB25_VERSION_NUMBER})
+target_link_libraries(aribb25-shared PRIVATE ${PCSC_LIBRARIES})
+generate_export_header(aribb25-shared BASE_NAME aribb25_api EXPORT_FILE_NAME aribb25_api.h)
 
 add_executable(b25 src/td.c ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-set_target_properties(b25 PROPERTIES OUTPUT_NAME ${ARIB25_CMD_NAME})
+set_target_properties(b25 PROPERTIES OUTPUT_NAME ${ARIBB25_CMD_NAME})
 target_link_libraries(b25 PRIVATE ${PCSC_LIBRARIES})
-target_link_libraries(b25 PRIVATE arib25-shared)
+target_link_libraries(b25 PRIVATE aribb25-shared)
 
 configure_file(src/config.h.in config.h @ONLY)
 configure_file(src/version.rc.in version.rc @ONLY)
 
 if(UNIX AND NOT CYGWIN)
-	configure_file(src/libarib25.pc.in ${CMAKE_SHARED_LIBRARY_PREFIX}${ARIB25_LIB_NAME}.pc @ONLY)
+	configure_file(src/libaribb25.pc.in ${CMAKE_SHARED_LIBRARY_PREFIX}${ARIBB25_LIB_NAME}.pc @ONLY)
 
 	install(TARGETS b25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-	install(TARGETS arib25-static arib25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-	install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/arib25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arib25)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARIB25_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+	install(TARGETS aribb25-static aribb25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+	install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/aribb25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARIBB25_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 	install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)")
 	
 	add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake)
 elseif(WIN32)
 	install(TARGETS b25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-	install(TARGETS arib25-static arib25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
-	install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/arib25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arib25)
+	install(TARGETS aribb25-static aribb25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
+	install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/aribb25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
 	add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake)
 endif()
diff --git a/NOTICE b/NOTICE
index 482c63a..ff9e88f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
-stz2012 - libarib25
+stz2012 - libaribb25
 
 Copyright (c)2012 stz2012 <tslroom@hotmail.com>
  
-This product include software from MARUMO Manufacturing libarib25 project.
+This product include software from MARUMO Manufacturing libaribb25 project.
   * Copyright (c)2007-2012 MOGI, Kazuhiro <kazhiro@marumo.ne.jp>; All rights reserved.
      MARUMO Manufacturing (https://www.marumo.ne.jp/) 
      Special Thanks: 2ch NoNames, eternalharvest, eru.
diff --git a/aribb25/arib_std_b25.h b/aribb25/arib_std_b25.h
index e574acc..47a1988 100644
--- a/aribb25/arib_std_b25.h
+++ b/aribb25/arib_std_b25.h
@@ -1,7 +1,7 @@
 #ifndef ARIB_STD_B25_H
 #define ARIB_STD_B25_H
 
-#include "arib25_api.h"
+#include "aribb25_api.h"
 #include "portable.h"
 #include "b_cas_card.h"
 
diff --git a/aribb25/b_cas_card.h b/aribb25/b_cas_card.h
index 1c0e734..d428f5f 100644
--- a/aribb25/b_cas_card.h
+++ b/aribb25/b_cas_card.h
@@ -1,7 +1,7 @@
 #ifndef B_CAS_CARD_H
 #define B_CAS_CARD_H
 
-#include "arib25_api.h"
+#include "aribb25_api.h"
 #include "portable.h"
 
 typedef struct {
diff --git a/aribb25/config.h.in b/aribb25/config.h.in
index 370f728..77ac201 100644
--- a/aribb25/config.h.in
+++ b/aribb25/config.h.in
@@ -1,11 +1,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define ARIB25_MAJOR_VERSION @ARIB25_MAJOR_VERSION@
-#define ARIB25_MINOR_VERSION @ARIB25_MINOR_VERSION@
-#define ARIB25_PATCH_VERSION @ARIB25_PATCH_VERSION@
-#define ARIB25_VERSION_NUMBER "@ARIB25_VERSION_NUMBER@"
-#define ARIB25_VERSION_STRING "@ARIB25_VERSION_STRING@"
+#define ARIBB25_MAJOR_VERSION @ARIBB25_MAJOR_VERSION@
+#define ARIBB25_MINOR_VERSION @ARIBB25_MINOR_VERSION@
+#define ARIBB25_PATCH_VERSION @ARIBB25_PATCH_VERSION@
+#define ARIBB25_VERSION_NUMBER "@ARIBB25_VERSION_NUMBER@"
+#define ARIBB25_VERSION_STRING "@ARIBB25_VERSION_STRING@"
 
 #define BUILD_OS_NAME "@CMAKE_SYSTEM@"
 #define BUILD_CC_NAME "@CMAKE_C_COMPILER_ID@"
diff --git a/aribb25/libarib25.pc.in b/aribb25/libarib25.pc.in
deleted file mode 100644
index ae56b5c..0000000
--- a/aribb25/libarib25.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: @CMAKE_LIBRARY_PREFIX@@ARIB25_LIB_NAME@
-Description: @ARIB25_DESCRIPTION@
-URL: @ARIB25_URL@
-Version: @ARIB25_VERSION_STRING@
-Libs: -L${libdir} -l@ARIB25_LIB_NAME@
-Cflags: -I${includedir}
diff --git a/aribb25/libaribb25.pc.in b/aribb25/libaribb25.pc.in
new file mode 100644
index 0000000..54332d8
--- /dev/null
+++ b/aribb25/libaribb25.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: @CMAKE_LIBRARY_PREFIX@@ARIBB25_LIB_NAME@
+Description: @ARIBB25_DESCRIPTION@
+URL: @ARIBB25_URL@
+Version: @ARIBB25_VERSION_STRING@
+Libs: -L${libdir} -l@ARIBB25_LIB_NAME@
+Cflags: -I${includedir}
diff --git a/aribb25/multi2.cc b/aribb25/multi2.cc
index d742be1..42aa348 100644
--- a/aribb25/multi2.cc
+++ b/aribb25/multi2.cc
@@ -118,7 +118,7 @@ static int decrypt_multi2(void *m2, int32_t type, uint8_t *buf, int32_t size);
 /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  global function implementation
  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-ARIB25_API_EXPORT MULTI2 *create_multi2()
+MULTI2 *create_multi2()
 {
 	multi2::multi2 *m2;
 	try {
diff --git a/aribb25/multi2.h b/aribb25/multi2.h
index 2d47dfb..044cd9d 100644
--- a/aribb25/multi2.h
+++ b/aribb25/multi2.h
@@ -1,7 +1,7 @@
 #ifndef MULTI2_H
 #define MULTI2_H
 
-#include "arib25_api.h"
+#include "aribb25_api.h"
 #include "portable.h"
 #include "simd_instruction_type.h"
 
diff --git a/aribb25/ts_section_parser.h b/aribb25/ts_section_parser.h
index a369fe3..ed831b8 100644
--- a/aribb25/ts_section_parser.h
+++ b/aribb25/ts_section_parser.h
@@ -1,7 +1,7 @@
 #ifndef TS_SECTION_PARSER_H
 #define TS_SECTION_PARSER_H
 
-#include "arib25_api.h"
+#include "aribb25_api.h"
 #include "ts_common_types.h"
 
 typedef struct {
diff --git a/aribb25/version.c b/aribb25/version.c
index a225fcf..99c67b7 100644
--- a/aribb25/version.c
+++ b/aribb25/version.c
@@ -9,7 +9,7 @@ const char elf_interp[] __attribute__((section(".interp"))) = ELF_INTERP;
 
 void show_version(void)
 {
-	fprintf(stderr, "libaribb25.so - ARIB STD-B25 shared library version %s (%s)\n", ARIB25_VERSION_STRING, BUILD_GIT_REVISION);
+	fprintf(stderr, "libaribb25.so - ARIB STD-B25 shared library version %s (%s)\n", ARIBB25_VERSION_STRING, BUILD_GIT_REVISION);
 	fprintf(stderr, "  built with %s %s on %s\n", BUILD_CC_NAME, BUILD_CC_VERSION, BUILD_OS_NAME);
 	_exit(0);
 }
diff --git a/aribb25/version.rc.in b/aribb25/version.rc.in
index c2488b3..3f866d2 100644
--- a/aribb25/version.rc.in
+++ b/aribb25/version.rc.in
@@ -3,8 +3,8 @@
 #pragma code_page(65001)
 
 VS_VERSION_INFO    VERSIONINFO
-FILEVERSION        @ARIB25_MAJOR_VERSION@,@ARIB25_MINOR_VERSION@,@ARIB25_PATCH_VERSION@,0
-PRODUCTVERSION     @ARIB25_MAJOR_VERSION@,@ARIB25_MINOR_VERSION@,@ARIB25_PATCH_VERSION@,0
+FILEVERSION        @ARIBB25_MAJOR_VERSION@,@ARIBB25_MINOR_VERSION@,@ARIBB25_PATCH_VERSION@,0
+PRODUCTVERSION     @ARIBB25_MAJOR_VERSION@,@ARIBB25_MINOR_VERSION@,@ARIBB25_PATCH_VERSION@,0
 FILEFLAGSMASK      VS_FFI_FILEFLAGSMASK
 #ifdef DEBUG
   FILEFLAGS        VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -12,7 +12,7 @@ FILEFLAGSMASK      VS_FFI_FILEFLAGSMASK
   FILEFLAGS        0
 #endif
 FILEOS             VOS_NT_WINDOWS32
-#ifdef ARIB25_DLL
+#ifdef ARIBB25_DLL
 FILETYPE           VFT_DLL
 #else
 FILETYPE           VFT_APP
@@ -23,22 +23,22 @@ BEGIN
   BEGIN
     BLOCK "080904b0"
     BEGIN
-      VALUE "CompanyName",      "@ARIB25_COMPANY@"
-      VALUE "FileDescription",  "@ARIB25_PRODUCT@ built with @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@ on @CMAKE_SYSTEM@"
-      VALUE "FileVersion",      "@ARIB25_VERSION_STRING@"
+      VALUE "CompanyName",      "@ARIBB25_COMPANY@"
+      VALUE "FileDescription",  "@ARIBB25_PRODUCT@ built with @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@ on @CMAKE_SYSTEM@"
+      VALUE "FileVersion",      "@ARIBB25_VERSION_STRING@"
       VALUE "InternalName",     "@PROJECT_NAME@"
-      VALUE "LegalCopyright",   "@ARIB25_COPYRIGHT@"
-#if defined(ARIB25_DLL)
-      VALUE "OriginalFilename", "@CMAKE_SHARED_LIBRARY_PREFIX@@ARIB25_LIB_NAME@@CMAKE_SHARED_LIBRARY_SUFFIX@"
+      VALUE "LegalCopyright",   "@ARIBB25_COPYRIGHT@"
+#if defined(ARIBB25_DLL)
+      VALUE "OriginalFilename", "@CMAKE_SHARED_LIBRARY_PREFIX@@ARIBB25_LIB_NAME@@CMAKE_SHARED_LIBRARY_SUFFIX@"
 #else
-      VALUE "OriginalFilename", "@ARIB25_CMD_NAME@@CMAKE_EXECUTABLE_SUFFIX@"
+      VALUE "OriginalFilename", "@ARIBB25_CMD_NAME@@CMAKE_EXECUTABLE_SUFFIX@"
 #endif
 #if defined(UNICODE)
-      VALUE "ProductName",      "@ARIB25_PRODUCT@ UNICODE"
+      VALUE "ProductName",      "@ARIBB25_PRODUCT@ UNICODE"
 #else
-      VALUE "ProductName",      "@ARIB25_PRODUCT@"
+      VALUE "ProductName",      "@ARIBB25_PRODUCT@"
 #endif
-      VALUE "ProductVersion",   "@ARIB25_VERSION_STRING@ (" BUILD_GIT_REVISION ")"
+      VALUE "ProductVersion",   "@ARIBB25_VERSION_STRING@ (" BUILD_GIT_REVISION ")"
     END
   END
   BLOCK "VarFileInfo"