diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1593da1..c39b002 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,7 @@
             android:exported="false"
             android:theme="@style/Theme.OxygenToolbox.Default">
             <intent-filter>
-                <action android:name="oxygentoolbox.converter" />
+                <action android:name="oxygentoolbox.baseconverter" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java
index 68bd8e8..471ecde 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java
@@ -27,10 +27,10 @@ public class MainActivity extends BaseActivityNormal {
     {
         for (int i = 0; i < 35; i++) {
             switch (i + 2) {
-                case 2 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_2);
-                case 8 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_8);
-                case 10 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_10);
-                case 16 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_16);
+                case 2 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_2);
+                case 8 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_8);
+                case 10 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_10);
+                case 16 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_16);
                 default -> BASE_ITEMS[i] = String.valueOf(i + 2);
             }
         }
@@ -58,7 +58,7 @@ public class MainActivity extends BaseActivityNormal {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        super.loadView(this, R.layout.activity_tool_converter);
+        super.loadView(this, R.layout.activity_tool_baseconverter);
 
         initView();
         initBaseChoose();
@@ -67,7 +67,7 @@ public class MainActivity extends BaseActivityNormal {
 
     private void initBaseChoose() {
         textViewBaseFrom.setOnClickListener(view -> new MaterialAlertDialogBuilder(this)
-                .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base))
+                .setTitle(ResourceUtil.getString(R.string.tool_baseconverter_choose_base))
                 .setItems(BASE_ITEMS, (dialogInterface, i) -> {
                     textViewBaseFrom.setText(BASE_ITEMS[i]);
                     baseFrom = i + 2;
@@ -77,7 +77,7 @@ public class MainActivity extends BaseActivityNormal {
                 .show());
 
         textViewBaseTo.setOnClickListener(view -> new MaterialAlertDialogBuilder(this)
-                .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base))
+                .setTitle(ResourceUtil.getString(R.string.tool_baseconverter_choose_base))
                 .setItems(BASE_ITEMS, (dialogInterface, i) -> {
                     textViewBaseTo.setText(BASE_ITEMS[i]);
                     baseTo = i + 2;
@@ -146,7 +146,7 @@ public class MainActivity extends BaseActivityNormal {
             textViewTo.setText(result);
         } catch (Exception e) {
             textViewTo.setText(ResourceUtil.getString(R.string.base_nan));
-            Snackbar.make(getConstraintLayoutRoot(), ResourceUtil.getString(R.string.tool_converter_illegal_number), Snackbar.LENGTH_LONG).show();
+            Snackbar.make(getConstraintLayoutRoot(), ResourceUtil.getString(R.string.tool_baseconverter_illegal_number), Snackbar.LENGTH_LONG).show();
         }
     }
 }
diff --git a/app/src/main/res/drawable/ic_tool_converter_convert.xml b/app/src/main/res/drawable/ic_tool_baseconverter_convert.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tool_converter_convert.xml
rename to app/src/main/res/drawable/ic_tool_baseconverter_convert.xml
diff --git a/app/src/main/res/layout/activity_tool_converter.xml b/app/src/main/res/layout/activity_tool_baseconverter.xml
similarity index 70%
rename from app/src/main/res/layout/activity_tool_converter.xml
rename to app/src/main/res/layout/activity_tool_baseconverter.xml
index 546f28e..e17cfea 100644
--- a/app/src/main/res/layout/activity_tool_converter.xml
+++ b/app/src/main/res/layout/activity_tool_baseconverter.xml
@@ -10,7 +10,7 @@
         android:id="@+id/linear_layout_base"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:layout_margin="@dimen/tool_baseconverter_layout_margin"
         android:background="@drawable/background_radius"
         android:gravity="center"
         android:orientation="horizontal"
@@ -22,16 +22,16 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@string/tool_converter_base_10"
+            android:text="@string/tool_baseconverter_base_10"
             android:textColor="?attr/app_theme"
-            android:textSize="@dimen/tool_converter_text_size" />
+            android:textSize="@dimen/tool_baseconverter_text_size" />
 
         <ImageView
             android:id="@+id/image_view_swap"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="Swap"
-            android:padding="@dimen/tool_converter_clickable_padding"
+            android:padding="@dimen/tool_baseconverter_clickable_padding"
             android:src="@drawable/animation_swap_horizon" />
 
         <TextView
@@ -40,52 +40,52 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@string/tool_converter_base_2"
+            android:text="@string/tool_baseconverter_base_2"
             android:textColor="?attr/app_theme"
-            android:textSize="@dimen/tool_converter_text_size" />
+            android:textSize="@dimen/tool_baseconverter_text_size" />
 
     </LinearLayout>
 
     <EditText
         android:id="@+id/edit_text_from"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tool_converter_edit_text_view_height"
-        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:layout_height="@dimen/tool_baseconverter_edit_text_view_height"
+        android:layout_margin="@dimen/tool_baseconverter_layout_margin"
         android:autofillHints="text"
         android:background="@drawable/background_radius"
         android:gravity="start|top"
-        android:hint="@string/tool_converter_please_enter_text"
+        android:hint="@string/tool_baseconverter_please_enter_text"
         android:inputType="text"
         android:maxLength="850"
-        android:paddingHorizontal="@dimen/tool_converter_edit_text_view_padding"
-        android:paddingTop="@dimen/tool_converter_edit_text_view_padding"
-        android:paddingBottom="@dimen/tool_converter_edit_text_view_padding_plus"
+        android:paddingHorizontal="@dimen/tool_baseconverter_edit_text_view_padding"
+        android:paddingTop="@dimen/tool_baseconverter_edit_text_view_padding"
+        android:paddingBottom="@dimen/tool_baseconverter_edit_text_view_padding_plus"
         android:textColor="?attr/app_text_theme"
-        android:textSize="@dimen/tool_converter_text_size"
+        android:textSize="@dimen/tool_baseconverter_text_size"
         app:layout_constraintTop_toBottomOf="@id/linear_layout_base" />
 
 
     <TextView
         android:id="@+id/text_view_to"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tool_converter_edit_text_view_height"
-        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:layout_height="@dimen/tool_baseconverter_edit_text_view_height"
+        android:layout_margin="@dimen/tool_baseconverter_layout_margin"
         android:autofillHints="text"
         android:background="@drawable/background_radius"
         android:gravity="start|top"
-        android:paddingHorizontal="@dimen/tool_converter_edit_text_view_padding"
-        android:paddingTop="@dimen/tool_converter_edit_text_view_padding_plus"
-        android:paddingBottom="@dimen/tool_converter_edit_text_view_padding"
+        android:paddingHorizontal="@dimen/tool_baseconverter_edit_text_view_padding"
+        android:paddingTop="@dimen/tool_baseconverter_edit_text_view_padding_plus"
+        android:paddingBottom="@dimen/tool_baseconverter_edit_text_view_padding"
         android:textColor="?attr/app_text_theme"
         android:textIsSelectable="true"
-        android:textSize="@dimen/tool_converter_text_size"
+        android:textSize="@dimen/tool_baseconverter_text_size"
         app:layout_constraintTop_toBottomOf="@id/edit_text_from" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/background_round"
-        android:padding="@dimen/tool_converter_clickable_padding"
+        android:padding="@dimen/tool_baseconverter_clickable_padding"
         app:layout_constraintBottom_toTopOf="@id/text_view_to"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +99,7 @@
             android:contentDescription="Convert"
             android:focusable="true"
             android:foreground="@drawable/foreground_ripple"
-            android:src="@drawable/ic_tool_converter_convert"
+            android:src="@drawable/ic_tool_baseconverter_convert"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e636db8..5e69d02 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -78,9 +78,9 @@
     <string name="tool_translation_please_enter_text">请输入内容……</string>
     <string name="tool_translation_translation_failed">翻译失败，请检查网络连接。</string>
 
-    <string name="tool_converter_choose_base">选择进制</string>
-    <string name="tool_converter_from_base">源进制</string>
-    <string name="tool_converter_to_base">目标进制</string>
-    <string name="tool_converter_please_enter_text">请输入内容……</string>
-    <string name="tool_converter_illegal_number">非法数字</string>
+    <string name="tool_baseconverter_choose_base">选择进制</string>
+    <string name="tool_baseconverter_from_base">源进制</string>
+    <string name="tool_baseconverter_to_base">目标进制</string>
+    <string name="tool_baseconverter_please_enter_text">请输入内容……</string>
+    <string name="tool_baseconverter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index e636db8..5e69d02 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -78,9 +78,9 @@
     <string name="tool_translation_please_enter_text">请输入内容……</string>
     <string name="tool_translation_translation_failed">翻译失败，请检查网络连接。</string>
 
-    <string name="tool_converter_choose_base">选择进制</string>
-    <string name="tool_converter_from_base">源进制</string>
-    <string name="tool_converter_to_base">目标进制</string>
-    <string name="tool_converter_please_enter_text">请输入内容……</string>
-    <string name="tool_converter_illegal_number">非法数字</string>
+    <string name="tool_baseconverter_choose_base">选择进制</string>
+    <string name="tool_baseconverter_from_base">源进制</string>
+    <string name="tool_baseconverter_to_base">目标进制</string>
+    <string name="tool_baseconverter_please_enter_text">请输入内容……</string>
+    <string name="tool_baseconverter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e636db8..5e69d02 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -78,9 +78,9 @@
     <string name="tool_translation_please_enter_text">请输入内容……</string>
     <string name="tool_translation_translation_failed">翻译失败，请检查网络连接。</string>
 
-    <string name="tool_converter_choose_base">选择进制</string>
-    <string name="tool_converter_from_base">源进制</string>
-    <string name="tool_converter_to_base">目标进制</string>
-    <string name="tool_converter_please_enter_text">请输入内容……</string>
-    <string name="tool_converter_illegal_number">非法数字</string>
+    <string name="tool_baseconverter_choose_base">选择进制</string>
+    <string name="tool_baseconverter_from_base">源进制</string>
+    <string name="tool_baseconverter_to_base">目标进制</string>
+    <string name="tool_baseconverter_please_enter_text">请输入内容……</string>
+    <string name="tool_baseconverter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bcc3635..078479b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -45,10 +45,10 @@
     <dimen name="tool_translation_layout_margin">@dimen/common_layout_margin</dimen>
     <dimen name="tool_translation_edit_text_view_height">200dp</dimen>
 
-    <dimen name="tool_converter_text_size">16sp</dimen>
-    <dimen name="tool_converter_clickable_padding">5dp</dimen>
-    <dimen name="tool_converter_layout_margin">@dimen/common_layout_margin</dimen>
-    <dimen name="tool_converter_edit_text_view_height">200dp</dimen>
-    <dimen name="tool_converter_edit_text_view_padding">15dp</dimen>
-    <dimen name="tool_converter_edit_text_view_padding_plus">30dp</dimen>
+    <dimen name="tool_baseconverter_text_size">16sp</dimen>
+    <dimen name="tool_baseconverter_clickable_padding">5dp</dimen>
+    <dimen name="tool_baseconverter_layout_margin">@dimen/common_layout_margin</dimen>
+    <dimen name="tool_baseconverter_edit_text_view_height">200dp</dimen>
+    <dimen name="tool_baseconverter_edit_text_view_padding">15dp</dimen>
+    <dimen name="tool_baseconverter_edit_text_view_padding_plus">30dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e1aa3c..35c1e25 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,13 +116,13 @@
     <string name="tool_translation_please_enter_text">Please enter text…</string>
     <string name="tool_translation_translation_failed">Translation failed, please check network connection.</string>
     
-    <string name="tool_converter_base_2" translatable="false">2 (binary)</string>
-    <string name="tool_converter_base_8" translatable="false">8 (octal)</string>
-    <string name="tool_converter_base_10" translatable="false">10 (decimal)</string>
-    <string name="tool_converter_base_16" translatable="false">16 (hex)</string>
-    <string name="tool_converter_choose_base">Choose base</string>
-    <string name="tool_converter_from_base">From Base</string>
-    <string name="tool_converter_to_base">To Base</string>
-    <string name="tool_converter_please_enter_text">Please enter text…</string>
-    <string name="tool_converter_illegal_number">Illegal Number</string>
+    <string name="tool_baseconverter_base_2" translatable="false">2 (binary)</string>
+    <string name="tool_baseconverter_base_8" translatable="false">8 (octal)</string>
+    <string name="tool_baseconverter_base_10" translatable="false">10 (decimal)</string>
+    <string name="tool_baseconverter_base_16" translatable="false">16 (hex)</string>
+    <string name="tool_baseconverter_choose_base">Choose base</string>
+    <string name="tool_baseconverter_from_base">From Base</string>
+    <string name="tool_baseconverter_to_base">To Base</string>
+    <string name="tool_baseconverter_please_enter_text">Please enter text…</string>
+    <string name="tool_baseconverter_illegal_number">Illegal Number</string>
 </resources>
\ No newline at end of file