diff --git a/README.md b/README.md
index 9c7c7206f..f7d6e2ae2 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,8 @@ The name in `code` is what you pass to `cachesim` on the command line (names are
 * [3LCache](/libCacheSim/cache/eviction/3LCache/) `3lcache` — build with `-DENABLE_3L_CACHE=ON`
 * [WTinyLFU](/libCacheSim/cache/eviction/WTinyLFU.c) `wtinylfu`
 * [QD-LP](/libCacheSim/cache/eviction/QDLP.c) `qdlp`
-* [S3-FIFO](/libCacheSim/cache/eviction/S3FIFO.c) `s3fifo`, [S3-FIFOd](/libCacheSim/cache/eviction/S3FIFOd.c) `s3fifod`
+* [S3-FIFO](/libCacheSim/cache/eviction/S3FIFO.c) `s3fifo`
+* [S4-FIFO](/libCacheSim/cache/eviction/S4FIFO/S4FIFO.c) `s4fifo` — build with `-DENABLE_S4FIFO=ON`
 * [Sieve](/libCacheSim/cache/eviction/Sieve.c) `sieve`
 
 ### Admission algorithms
diff --git a/libCacheSim/cache/cacheAlgoRegistry.c b/libCacheSim/cache/cacheAlgoRegistry.c
index 55e514329..8b3cc35be 100644
--- a/libCacheSim/cache/cacheAlgoRegistry.c
+++ b/libCacheSim/cache/cacheAlgoRegistry.c
@@ -65,7 +65,6 @@ static const cache_algo_entry_t g_cache_algos[] = {
     {"s3-fifo", S3FIFO_init},
     {"s3-fifov0", S3FIFOv0_init},
     {"s3fifo", S3FIFO_init},
-    {"s3fifod", S3FIFOd_init},
     {"s3fifov0", S3FIFOv0_init},
     {"sieve", Sieve_init},
     {"size", Size_init},
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 8ab1ba76b..adf8afadb 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -171,8 +171,8 @@ expect_output "slru -e print with auto sizing" "n-seg=" \
 	"${BIN_DIR}/cachesim" "${TRACE}" vscsi slru auto -e print
 expect_output "qdlp -e print" "fifo-size-ratio=" \
 	"${BIN_DIR}/cachesim" "${TRACE_ORACLE}" oracleGeneral qdlp 1gb -e print
-expect_output "s3fifod -e print" "fifo-size-ratio=" \
-	"${BIN_DIR}/cachesim" "${TRACE_ORACLE}" oracleGeneral s3fifod 1gb -e print
+expect_output "s3fifo -e print" "small-size-ratio=" \
+	"${BIN_DIR}/cachesim" "${TRACE_ORACLE}" oracleGeneral s3fifo 1gb -e print
 
 # Sweep every algorithm the CLI registers rather than a hand-picked list: the
 # crashes this covers were found in variants that a shorter list missed
@@ -189,7 +189,7 @@ ALL_ALGOS="2q 3LCache CAR GLCache RandomLRU arc arcv0 cacheus clock clock2qplus
 	clockpro fifo fifo-merge fifo-reinsertion fifomerge flashProb gdsf gl-cache
 	lecar lecarv0 lfu lfucpp lfuda lhd lirs lrb lru lru-k lru-prob mq
 	multiqueue nop
-	pluginCache qdlp random randomTwo s3-fifo s3-fifov0 s3fifo s3fifod s3fifov0
+	pluginCache qdlp random randomTwo s3-fifo s3-fifov0 s3fifo s3fifov0
 	sieve size slru slruv0 tinyLFU twoq wtinyLFU
 	hyperbolic belady beladySize"
 
@@ -313,7 +313,7 @@ done
 # floor the result reached zero, which cache_struct_init reads as "unset" and
 # replaces with the full-size default — so asking for a small table allocated
 # several large ones instead. slruv0 at hashpower 4 took 18 MB against 6 MB at 5.
-for algo in slruv0 s3fifod cacheus lru; do
+for algo in slruv0 s3fifo cacheus lru; do
 	for hp in 4 5 6 8; do
 		expect_ok "${algo} at --hashpower=${hp}" \
 			"${BIN_DIR}/cachesim" "${TRACE_ORACLE}" oracleGeneral "${algo}" 10mb \