diff --git a/.github/workflows/block-cipher-trait.yml b/.github/workflows/block-cipher.yml
similarity index 85%
rename from .github/workflows/block-cipher-trait.yml
rename to .github/workflows/block-cipher.yml
index e138aa54..17a6dc35 100644
--- a/.github/workflows/block-cipher-trait.yml
+++ b/.github/workflows/block-cipher.yml
@@ -1,14 +1,14 @@
-name: block-cipher-trait
+name: block-cipher
 
 on:
   pull_request:
     paths:
-      - "block-cipher-trait/**"
+      - "block-cipher/**"
       - "Cargo.*"
   push:
     branches: master
     paths:
-    - "block-cipher-trait/**"
+    - "block-cipher/**"
     - "Cargo.*"
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - working-directory: block-cipher-trait
+      - working-directory: block-cipher
         run: cargo build --no-default-features --release --target ${{ matrix.target }}
   test:
     runs-on: ubuntu-latest
@@ -50,4 +50,4 @@ jobs:
         cargo test --features dev
         cargo test --features std
         cargo test --all-features
-      working-directory: block-cipher-trait
+      working-directory: block-cipher
diff --git a/Cargo.lock b/Cargo.lock
index 6533240a..b385c1c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,7 +41,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "block-cipher-trait"
+name = "block-cipher"
 version = "0.7.0-pre"
 dependencies = [
  "blobby",
diff --git a/Cargo.toml b/Cargo.toml
index 421cdb5c..888dea81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "aead",
-    "block-cipher-trait",
+    "block-cipher",
     "crypto-mac",
     "digest",
     "signature",
diff --git a/README.md b/README.md
index 1b45ed3f..ecfac1fe 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Collection of traits which describe functionality of cryptographic primitives.
 | Name               | Algorithm                     | Crates.io | Documentation  | Build |
 |--------------------|-------------------------------|-----------|----------------|-------|
 | [`aead`]           | [Authenticated encryption]    | [![crates.io](https://img.shields.io/crates/v/aead.svg)](https://crates.io/crates/aead) | [![Documentation](https://docs.rs/aead/badge.svg)](https://docs.rs/aead) | ![build](https://github.com/RustCrypto/traits/workflows/aead/badge.svg?branch=master&event=push) |
-| [`block-cipher-trait`] | [Block cipher]            | [![crates.io](https://img.shields.io/crates/v/block-cipher-trait.svg)](https://crates.io/crates/block-cipher-trait) | [![Documentation](https://docs.rs/block-cipher-trait/badge.svg)](https://docs.rs/block-cipher-trait) | ![build](https://github.com/RustCrypto/traits/workflows/block-cipher-trait/badge.svg?branch=master&event=push) |
+| [`block-cipher`] | [Block cipher]            | [![crates.io](https://img.shields.io/crates/v/block-cipher.svg)](https://crates.io/crates/block-cipher) | [![Documentation](https://docs.rs/block-cipher/badge.svg)](https://docs.rs/block-cipher) | ![build](https://github.com/RustCrypto/traits/workflows/block-cipher/badge.svg?branch=master&event=push) |
 | [`crypto-mac`]     | [Message authentication code] | [![crates.io](https://img.shields.io/crates/v/crypto-mac.svg)](https://crates.io/crates/crypto-mac) | [![Documentation](https://docs.rs/crypto-mac/badge.svg)](https://docs.rs/crypto-mac) | ![build](https://github.com/RustCrypto/traits/workflows/crypto-mac/badge.svg?branch=master&event=push) |
 | [`digest`]         | [Cryptographic hash function] | [![crates.io](https://img.shields.io/crates/v/digest.svg)](https://crates.io/crates/digest) | [![Documentation](https://docs.rs/digest/badge.svg)](https://docs.rs/digest) | ![build](https://github.com/RustCrypto/traits/workflows/digest/badge.svg?branch=master&event=push) |
 | [`signature`]      | [Digital signature]           | [![crates.io](https://img.shields.io/crates/v/signature.svg)](https://crates.io/crates/signature) | [![Documentation](https://docs.rs/signature/badge.svg)](https://docs.rs/signature) | ![build](https://github.com/RustCrypto/traits/workflows/signature/badge.svg?branch=master&event=push) |
@@ -43,7 +43,7 @@ dual licensed as above, without any additional terms or conditions.
 [//]: # (crates)
 
 [`aead`]: https://github.com/RustCrypto/traits/tree/master/aead
-[`block-cipher-trait`]: https://github.com/RustCrypto/traits/tree/master/block-cipher-trait
+[`block-cipher`]: https://github.com/RustCrypto/traits/tree/master/block-cipher
 [`crypto-mac`]: https://github.com/RustCrypto/traits/tree/master/crypto-mac
 [`digest`]: https://github.com/RustCrypto/traits/tree/master/digest
 [`signature`]: https://github.com/RustCrypto/traits/tree/master/signature
diff --git a/block-cipher-trait/Cargo.toml b/block-cipher/Cargo.toml
similarity index 86%
rename from block-cipher-trait/Cargo.toml
rename to block-cipher/Cargo.toml
index 41b9df87..a74a8842 100644
--- a/block-cipher-trait/Cargo.toml
+++ b/block-cipher/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "block-cipher-trait"
+name = "block-cipher"
 description = "Traits for description of block ciphers"
 version = "0.7.0-pre"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 edition = "2018"
-documentation = "https://docs.rs/block-cipher-trait"
+documentation = "https://docs.rs/block-cipher"
 repository = "https://github.com/RustCrypto/traits"
 keywords = ["crypto", "block-cipher", "trait"]
 categories = ["cryptography", "no-std"]
diff --git a/block-cipher-trait/LICENSE-APACHE b/block-cipher/LICENSE-APACHE
similarity index 100%
rename from block-cipher-trait/LICENSE-APACHE
rename to block-cipher/LICENSE-APACHE
diff --git a/block-cipher-trait/LICENSE-MIT b/block-cipher/LICENSE-MIT
similarity index 100%
rename from block-cipher-trait/LICENSE-MIT
rename to block-cipher/LICENSE-MIT
diff --git a/block-cipher-trait/README.md b/block-cipher/README.md
similarity index 83%
rename from block-cipher-trait/README.md
rename to block-cipher/README.md
index 5ab97ef6..553989fa 100644
--- a/block-cipher-trait/README.md
+++ b/block-cipher/README.md
@@ -41,14 +41,14 @@ dual licensed as above, without any additional terms or conditions.
 
 [//]: # (badges)
 
-[crate-image]: https://img.shields.io/crates/v/block-cipher-trait.svg
-[crate-link]: https://crates.io/crates/block-cipher-trait
-[docs-image]: https://docs.rs/block-cipher-trait/badge.svg
-[docs-link]: https://docs.rs/block-cipher-trait/
+[crate-image]: https://img.shields.io/crates/v/block-cipher.svg
+[crate-link]: https://crates.io/crates/block-cipher
+[docs-image]: https://docs.rs/block-cipher/badge.svg
+[docs-link]: https://docs.rs/block-cipher/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
-[build-image]: https://github.com/RustCrypto/traits/workflows/block-cipher-trait/badge.svg?branch=master&event=push
-[build-link]: https://github.com/RustCrypto/traits/actions?query=workflow%3Ablock-cipher-trait
+[build-image]: https://github.com/RustCrypto/traits/workflows/block-cipher/badge.svg?branch=master&event=push
+[build-link]: https://github.com/RustCrypto/traits/actions?query=workflow%3Ablock-cipher
 
 [//]: # (general links)
 
diff --git a/block-cipher-trait/src/dev.rs b/block-cipher/src/dev.rs
similarity index 100%
rename from block-cipher-trait/src/dev.rs
rename to block-cipher/src/dev.rs
diff --git a/block-cipher-trait/src/errors.rs b/block-cipher/src/errors.rs
similarity index 100%
rename from block-cipher-trait/src/errors.rs
rename to block-cipher/src/errors.rs
diff --git a/block-cipher-trait/src/lib.rs b/block-cipher/src/lib.rs
similarity index 100%
rename from block-cipher-trait/src/lib.rs
rename to block-cipher/src/lib.rs