diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index fa1f75ff4..923000d65 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -40,11 +40,11 @@ jobs:
         with:
           name: packages-${{ matrix.rake-job }}
           path: fluent-package/apt/repositories
-      - name: Upload fluentd-apt-source deb
+      - name: Upload fluent-apt-source deb
         uses: actions/upload-artifact@master
         with:
           name: packages-apt-source-${{ matrix.rake-job }}
-          path: fluentd-apt-source/apt/repositories
+          path: fluent-apt-source/apt/repositories
       # TODO move the following steps to "Test" job
       - name: Check Package Size
         run: |
diff --git a/.gitignore b/.gitignore
index d39cc9a27..a0c95ac32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,12 @@
 /fluent-package/dmg/td-agent.rsrc
 /fluent-package/dmg/resources/pkg/scripts/postinstall
 /fluent-package/dmg/resources/dmg/td-agent.osascript
-/fluentd-apt-source/apt/build.sh
-/fluentd-apt-source/apt/env.sh
-/fluentd-apt-source/apt/repositories/
-/fluentd-apt-source/apt/tmp/
+/fluent-apt-source/apt/build.sh
+/fluent-apt-source/apt/env.sh
+/fluent-apt-source/apt/repositories/
+/fluent-apt-source/apt/tmp/
 *.wixobj
 *.wixpdb
 *.msi
 *.gz
-*.DS_Store
\ No newline at end of file
+*.DS_Store
diff --git a/Rakefile b/Rakefile
index af2a76835..57693a635 100755
--- a/Rakefile
+++ b/Rakefile
@@ -20,12 +20,12 @@ PACKAGES = [
 ]
 
 APT_SOURCE_PACKAGES = [
-  "fluentd-apt-source"
+  "fluent-apt-source"
 ]
 
 ALL_PACKAGE = [
   "fluent-package",
-  "fluentd-apt-source",
+  "fluent-apt-source",
 ]
 
 def define_bulked_task(name, description, packages = PACKAGES)
@@ -56,7 +56,7 @@ end
 end
 
 [
-  ["apt:build", "Build fluentd-apt-source deb packages", APT_SOURCE_PACKAGES],
+  ["apt:build", "Build fluent-apt-source deb packages", APT_SOURCE_PACKAGES],
 ].each do |params|
   define_bulked_task(*params)
 end
diff --git a/fluentd-apt-source/Rakefile b/fluent-apt-source/Rakefile
similarity index 99%
rename from fluentd-apt-source/Rakefile
rename to fluent-apt-source/Rakefile
index 57d5cb385..d47d3e2f5 100644
--- a/fluentd-apt-source/Rakefile
+++ b/fluent-apt-source/Rakefile
@@ -13,7 +13,7 @@ CLOBBER.include("apt/repositories")
 
 class FluentdAptSourcePackageTask < PackageTask
   def initialize
-    super("fluentd-apt-source",
+    super("fluent-apt-source",
           repository_version,
           latest_commit_time(File.join(__dir__, "..")))
     CLEAN.include(@archive_name)
diff --git a/fluentd-apt-source/apt/debian-bookworm/Dockerfile b/fluent-apt-source/apt/debian-bookworm/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/debian-bookworm/Dockerfile
rename to fluent-apt-source/apt/debian-bookworm/Dockerfile
diff --git a/fluentd-apt-source/apt/debian-bullseye/Dockerfile b/fluent-apt-source/apt/debian-bullseye/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/debian-bullseye/Dockerfile
rename to fluent-apt-source/apt/debian-bullseye/Dockerfile
diff --git a/fluentd-apt-source/apt/debian-buster/Dockerfile b/fluent-apt-source/apt/debian-buster/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/debian-buster/Dockerfile
rename to fluent-apt-source/apt/debian-buster/Dockerfile
diff --git a/fluentd-apt-source/apt/ubuntu-bionic/Dockerfile b/fluent-apt-source/apt/ubuntu-bionic/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/ubuntu-bionic/Dockerfile
rename to fluent-apt-source/apt/ubuntu-bionic/Dockerfile
diff --git a/fluentd-apt-source/apt/ubuntu-focal/Dockerfile b/fluent-apt-source/apt/ubuntu-focal/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/ubuntu-focal/Dockerfile
rename to fluent-apt-source/apt/ubuntu-focal/Dockerfile
diff --git a/fluentd-apt-source/apt/ubuntu-jammy/Dockerfile b/fluent-apt-source/apt/ubuntu-jammy/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/ubuntu-jammy/Dockerfile
rename to fluent-apt-source/apt/ubuntu-jammy/Dockerfile
diff --git a/fluentd-apt-source/apt/ubuntu-xenial/Dockerfile b/fluent-apt-source/apt/ubuntu-xenial/Dockerfile
similarity index 100%
rename from fluentd-apt-source/apt/ubuntu-xenial/Dockerfile
rename to fluent-apt-source/apt/ubuntu-xenial/Dockerfile
diff --git a/fluentd-apt-source/debian/changelog b/fluent-apt-source/debian/changelog
similarity index 91%
rename from fluentd-apt-source/debian/changelog
rename to fluent-apt-source/debian/changelog
index 392d86b63..73d003feb 100644
--- a/fluentd-apt-source/debian/changelog
+++ b/fluent-apt-source/debian/changelog
@@ -1,4 +1,4 @@
-fluentd-apt-source (2023.6.29-1) unstable; urgency=medium
+fluent-apt-source (2023.6.29-1) unstable; urgency=medium
 
   * New upstream release.
   * Added new Fluent Package Official Signing Key.
diff --git a/fluentd-apt-source/debian/control b/fluent-apt-source/debian/control
similarity index 57%
rename from fluentd-apt-source/debian/control
rename to fluent-apt-source/debian/control
index 4aa2b326c..8469e759e 100644
--- a/fluentd-apt-source/debian/control
+++ b/fluent-apt-source/debian/control
@@ -1,4 +1,4 @@
-Source: fluentd-apt-source
+Source: fluent-apt-source
 Section: misc
 Priority: optional
 Maintainer: Fluentd developers <fluentd@googlegroups.com>
@@ -9,13 +9,25 @@ Build-Depends:
 Standards-Version: 4.5.0
 Homepage: https://www.fluentd.org/
 
-Package: fluentd-apt-source
+Package: fluent-apt-source
 Section: misc
 Architecture: all
 Depends:
   ${misc:Depends},
-  apt-transport-https,
   gnupg
+Replaces: fluentd-apt-source (<< 2023.6.29-1)
+Breaks: fluentd-apt-source (<< 2023.6.29-1)
 Description: GnuPG archive key and APT source of the Fluent Package archive
  The Fluentd project digitally signs its Release files. This package
  contains the archive key used for that.
+
+Package: fluentd-apt-source
+Section: oldlibs
+Architecture: all
+Depends:
+  ${misc:Depends},
+  fluent-apt-source
+Description: Transitional package for fluent-apt-source
+ This is a transitional package for fluent-apt-source.
+ .
+ It can be safely be removed.
diff --git a/fluentd-apt-source/debian/copyright b/fluent-apt-source/debian/copyright
similarity index 100%
rename from fluentd-apt-source/debian/copyright
rename to fluent-apt-source/debian/copyright
diff --git a/fluentd-apt-source/debian/fluentd-apt-source.install b/fluent-apt-source/debian/fluent-apt-source.install
similarity index 100%
rename from fluentd-apt-source/debian/fluentd-apt-source.install
rename to fluent-apt-source/debian/fluent-apt-source.install
diff --git a/fluent-apt-source/debian/fluent-apt-source.lintian-overrides b/fluent-apt-source/debian/fluent-apt-source.lintian-overrides
new file mode 100644
index 000000000..4bab60aef
--- /dev/null
+++ b/fluent-apt-source/debian/fluent-apt-source.lintian-overrides
@@ -0,0 +1 @@
+fluent-apt-source: new-package-should-close-itp-bug
diff --git a/fluent-apt-source/debian/lintian/fluent-apt-source/debian.profile b/fluent-apt-source/debian/lintian/fluent-apt-source/debian.profile
new file mode 100644
index 000000000..ab645e700
--- /dev/null
+++ b/fluent-apt-source/debian/lintian/fluent-apt-source/debian.profile
@@ -0,0 +1,3 @@
+Profile: fluent-apt-source/main
+Extends: debian/main
+Disable-Tags: dir-or-file-in-opt
diff --git a/fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile b/fluent-apt-source/debian/lintian/fluent-apt-source/ubuntu.profile
similarity index 62%
rename from fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile
rename to fluent-apt-source/debian/lintian/fluent-apt-source/ubuntu.profile
index 5c775fc52..6c05fbc1e 100644
--- a/fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile
+++ b/fluent-apt-source/debian/lintian/fluent-apt-source/ubuntu.profile
@@ -1,3 +1,3 @@
-Profile: fluentd-apt-source/main
+Profile: fluent-apt-source/main
 Extends: ubuntu/main
 Disable-Tags: dir-or-file-in-opt
diff --git a/fluentd-apt-source/debian/rules b/fluent-apt-source/debian/rules
similarity index 100%
rename from fluentd-apt-source/debian/rules
rename to fluent-apt-source/debian/rules
diff --git a/fluentd-apt-source/debian/source/format b/fluent-apt-source/debian/source/format
similarity index 100%
rename from fluentd-apt-source/debian/source/format
rename to fluent-apt-source/debian/source/format
diff --git a/fluent-apt-source/debian/source/lintian-overrides b/fluent-apt-source/debian/source/lintian-overrides
new file mode 100644
index 000000000..6b08884c0
--- /dev/null
+++ b/fluent-apt-source/debian/source/lintian-overrides
@@ -0,0 +1,5 @@
+fluent-apt-source source: changelog-should-mention-nmu
+fluent-apt-source source: source-nmu-has-incorrect-version-number
+# When development machine has switched to aptly 1.4.0+ds1-7 or later,
+# remove the following (bookworm or later, ubuntu 22.10 or later)
+fluent-apt-source: debian-rules-should-not-use-custom-compression-settings
diff --git a/fluentd-apt-source/fluent-package-signing-key.ashie.gpg b/fluent-apt-source/fluent-package-signing-key.ashie.gpg
similarity index 100%
rename from fluentd-apt-source/fluent-package-signing-key.ashie.gpg
rename to fluent-apt-source/fluent-package-signing-key.ashie.gpg
diff --git a/fluentd-apt-source/fluent-package-signing-key.fukuda.gpg b/fluent-apt-source/fluent-package-signing-key.fukuda.gpg
similarity index 100%
rename from fluentd-apt-source/fluent-package-signing-key.fukuda.gpg
rename to fluent-apt-source/fluent-package-signing-key.fukuda.gpg
diff --git a/fluentd-apt-source/fluent-package-signing-key.hayashi.gpg b/fluent-apt-source/fluent-package-signing-key.hayashi.gpg
similarity index 100%
rename from fluentd-apt-source/fluent-package-signing-key.hayashi.gpg
rename to fluent-apt-source/fluent-package-signing-key.hayashi.gpg
diff --git a/fluentd-apt-source/fluent-package.pub b/fluent-apt-source/fluent-package.pub
similarity index 100%
rename from fluentd-apt-source/fluent-package.pub
rename to fluent-apt-source/fluent-package.pub
diff --git a/fluent-package/apt/install-test.sh b/fluent-package/apt/install-test.sh
index f2a819849..8ec8117e2 100755
--- a/fluent-package/apt/install-test.sh
+++ b/fluent-package/apt/install-test.sh
@@ -25,8 +25,8 @@ if ! getent group _fluentd >/dev/null; then
     exit 1
 fi
 
-echo "fluentd-apt-source test"
-apt_source_repositories_dir=/fluentd/fluentd-apt-source/apt/repositories
+echo "fluent-apt-source test"
+apt_source_repositories_dir=/fluentd/fluent-apt-source/apt/repositories
 apt purge -y fluent-package
 
 for conf_path in /etc/td-agent/td-agent.conf /etc/fluent/fluentd.conf; do
@@ -43,7 +43,7 @@ apt install -y ./fluentd-apt-source_2020.8.25-1_all.deb
 
 apt clean all
 # Uncomment when v5 repository was deployed
-#apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/fluentd-apt-source*_all.deb
+#apt_source_package=${apt_source_repositories_dir}/${distribution}/pool/${code_name}/${channel}/*/*/fluent-apt-source*_all.deb
 #apt install -V -y ${apt_source_package} ca-certificates
 apt update
 apt install -V -y td-agent
diff --git a/fluent-package/apt/systemd-test/update-from-v4.sh b/fluent-package/apt/systemd-test/update-from-v4.sh
index 40f1433d0..d48630a8b 100755
--- a/fluent-package/apt/systemd-test/update-from-v4.sh
+++ b/fluent-package/apt/systemd-test/update-from-v4.sh
@@ -12,7 +12,7 @@ sudo apt install -y ./fluentd-apt-source_2020.8.25-1_all.deb
 # Install v4
 sudo apt clean all
 # Uncomment when v5 repository was deployed
-#apt_source_package=/vagrant/${distribution}/pool/${code_name}/${channel}/*/*/fluentd-apt-source*_all.deb
+#apt_source_package=/vagrant/${distribution}/pool/${code_name}/${channel}/*/*/fluent-apt-source*_all.deb
 #sudo apt install -V -y ${apt_source_package} ca-certificates
 sudo apt update
 sudo apt install -V -y td-agent=4.5.0-1
diff --git a/fluent-package/convert-artifacts-layout.sh b/fluent-package/convert-artifacts-layout.sh
index 4506b8a70..067f2cec3 100755
--- a/fluent-package/convert-artifacts-layout.sh
+++ b/fluent-package/convert-artifacts-layout.sh
@@ -22,26 +22,26 @@ case $1 in
 		    #      mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/t/td-agent
 		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package
-		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source
+		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source
 		    find $REPOSITORY_PATH/debian/pool/$d -name 'td-agent*.deb' -not -name '*dbgsym*' \
 			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
 		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-package*.deb' -not -name '*dbgsym*' \
 			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
-		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluentd-apt-source*.deb' -not -name '*dbgsym*' \
-			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source \;
+		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' -not -name '*dbgsym*' \
+			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source \;
 		    ;;
 		focal|jammy)
 		    # e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
 		    #      mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/t/td-agent
 		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package
-		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source
+		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source
 		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'td-agent*.deb' \
 			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
 		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent-package*.deb' \
 			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
-		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluentd-apt-source*.deb' \
-			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluentd-apt-source \;
+		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent*-apt-source*.deb' \
+			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source \;
 		    ;;
 		*)
 		    exit 1
diff --git a/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides b/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides
deleted file mode 100644
index 9b04ccdd4..000000000
--- a/fluentd-apt-source/debian/fluentd-apt-source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-fluentd-apt-source: new-package-should-close-itp-bug
diff --git a/fluentd-apt-source/debian/lintian/fluentd-apt-source/debian.profile b/fluentd-apt-source/debian/lintian/fluentd-apt-source/debian.profile
deleted file mode 100644
index d8c2072db..000000000
--- a/fluentd-apt-source/debian/lintian/fluentd-apt-source/debian.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-Profile: fluentd-apt-source/main
-Extends: debian/main
-Disable-Tags: dir-or-file-in-opt
\ No newline at end of file
diff --git a/fluentd-apt-source/debian/source/lintian-overrides b/fluentd-apt-source/debian/source/lintian-overrides
deleted file mode 100644
index 480e2d739..000000000
--- a/fluentd-apt-source/debian/source/lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-fluentd-apt-source source: changelog-should-mention-nmu
-fluentd-apt-source source: source-nmu-has-incorrect-version-number
-# When development machine has switched to aptly 1.4.0+ds1-7 or later,
-# remove the following (bookworm or later, ubuntu 22.10 or later)
-fluentd-apt-source: debian-rules-should-not-use-custom-compression-settings