diff --git a/build.rs b/build.rs
index 5cd63e85..469b5326 100644
--- a/build.rs
+++ b/build.rs
@@ -55,16 +55,11 @@ fn template(
 fn main() -> Result<(), Box<dyn Error>> {
     let variables = init_template();
 
-    template(
-        &variables,
-        "assets/manual/bat.1.in",
-        &format!("assets/manual/{}.1", EXECUTABLE_NAME.to_owned()),
-    )?;
-
+    template(&variables, "assets/manual/bat.1.in", "assets/manual/bat.1")?;
     template(
         &variables,
         "assets/completions/bat.fish.in",
-        &format!("assets/completions/{}.fish", EXECUTABLE_NAME.to_owned()),
+        "assets/completions/bat.fish",
     )?;
 
     Ok(())
diff --git a/ci/before_deploy.bash b/ci/before_deploy.bash
index 1d5069e4..0cbb6dc8 100755
--- a/ci/before_deploy.bash
+++ b/ci/before_deploy.bash
@@ -7,10 +7,6 @@ if [[ -z "$PROJECT_NAME" ]]; then
     export PROJECT_NAME="bat"
 fi
 
-if [[ -z "$PROJECT_EXECUTABLE" ]]; then
-    export PROJECT_EXECUTABLE="$PROJECT_NAME"
-fi
-
 build() {
     cargo build --target "$TARGET" --release --verbose
 }
@@ -42,7 +38,7 @@ pack() {
     "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
 
     # manpage, readme and license
-    cp "assets/manual/$PROJECT_EXECUTABLE.1" "$tempdir/$package_name"
+    cp "assets/manual/bat.1" "$tempdir/$package_name/$PROJECT_NAME.1"
     cp README.md "$tempdir/$package_name"
     cp LICENSE-MIT "$tempdir/$package_name"
     cp LICENSE-APACHE "$tempdir/$package_name"
@@ -51,7 +47,7 @@ pack() {
     # TODO: disabled for now, see issue #372
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".bash "$tempdir/$package_name/autocomplete/${PROJECT_NAME}.bash-completion"
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".fish "$tempdir/$package_name/autocomplete"
-    cp "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/$package_name/autocomplete"
+    cp "assets/completions/bat.fish" "$tempdir/$package_name/autocomplete/$PROJECT_NAME.fish"
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"
 
     # archiving
@@ -112,11 +108,11 @@ make_deb() {
     "${gcc_prefix}"strip "$tempdir/usr/bin/$PROJECT_NAME"
 
     # manpage
-    install -Dm644 "assets/manual/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
+    install -Dm644 "assets/manual/bat.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
     gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
 
     # completions
-    install -Dm644 "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
+    install -Dm644 "assets/completions/bat.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
 
     # readme and license
     install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"