diff --git a/test/registered/attention/unittest/KNOWN_FAILURES.md b/test/registered/attention/unittests/KNOWN_FAILURES.md
similarity index 100%
rename from test/registered/attention/unittest/KNOWN_FAILURES.md
rename to test/registered/attention/unittests/KNOWN_FAILURES.md
diff --git a/test/registered/attention/unittest/__init__.py b/test/registered/attention/unittests/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/__init__.py
rename to test/registered/attention/unittests/__init__.py
diff --git a/test/registered/attention/unittest/conftest.py b/test/registered/attention/unittests/conftest.py
similarity index 100%
rename from test/registered/attention/unittest/conftest.py
rename to test/registered/attention/unittests/conftest.py
diff --git a/test/registered/attention/unittest/dense/README.md b/test/registered/attention/unittests/dense/README.md
similarity index 100%
rename from test/registered/attention/unittest/dense/README.md
rename to test/registered/attention/unittests/dense/README.md
diff --git a/test/registered/attention/unittest/dense/__init__.py b/test/registered/attention/unittests/dense/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/dense/__init__.py
rename to test/registered/attention/unittests/dense/__init__.py
diff --git a/test/registered/attention/unittest/dense/test_fa3.py b/test/registered/attention/unittests/dense/test_fa3.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_fa3.py
rename to test/registered/attention/unittests/dense/test_fa3.py
diff --git a/test/registered/attention/unittest/dense/test_fa4.py b/test/registered/attention/unittests/dense/test_fa4.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_fa4.py
rename to test/registered/attention/unittests/dense/test_fa4.py
diff --git a/test/registered/attention/unittest/dense/test_flashinfer.py b/test/registered/attention/unittests/dense/test_flashinfer.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_flashinfer.py
rename to test/registered/attention/unittests/dense/test_flashinfer.py
diff --git a/test/registered/attention/unittest/dense/test_flex_attention.py b/test/registered/attention/unittests/dense/test_flex_attention.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_flex_attention.py
rename to test/registered/attention/unittests/dense/test_flex_attention.py
diff --git a/test/registered/attention/unittest/dense/test_hybrid_attn.py b/test/registered/attention/unittests/dense/test_hybrid_attn.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_hybrid_attn.py
rename to test/registered/attention/unittests/dense/test_hybrid_attn.py
diff --git a/test/registered/attention/unittest/dense/test_tbo.py b/test/registered/attention/unittests/dense/test_tbo.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_tbo.py
rename to test/registered/attention/unittests/dense/test_tbo.py
diff --git a/test/registered/attention/unittest/dense/test_torch_native.py b/test/registered/attention/unittests/dense/test_torch_native.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_torch_native.py
rename to test/registered/attention/unittests/dense/test_torch_native.py
diff --git a/test/registered/attention/unittest/dense/test_triton.py b/test/registered/attention/unittests/dense/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_triton.py
rename to test/registered/attention/unittests/dense/test_triton.py
diff --git a/test/registered/attention/unittest/dense/test_trtllm_mha.py b/test/registered/attention/unittests/dense/test_trtllm_mha.py
similarity index 100%
rename from test/registered/attention/unittest/dense/test_trtllm_mha.py
rename to test/registered/attention/unittests/dense/test_trtllm_mha.py
diff --git a/test/registered/attention/unittest/dsa/README.md b/test/registered/attention/unittests/dsa/README.md
similarity index 100%
rename from test/registered/attention/unittest/dsa/README.md
rename to test/registered/attention/unittests/dsa/README.md
diff --git a/test/registered/attention/unittest/dsa/__init__.py b/test/registered/attention/unittests/dsa/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/dsa/__init__.py
rename to test/registered/attention/unittests/dsa/__init__.py
diff --git a/test/registered/attention/unittest/dsa/test_dsa.py b/test/registered/attention/unittests/dsa/test_dsa.py
similarity index 100%
rename from test/registered/attention/unittest/dsa/test_dsa.py
rename to test/registered/attention/unittests/dsa/test_dsa.py
diff --git a/test/registered/attention/unittest/dsv4/README.md b/test/registered/attention/unittests/dsv4/README.md
similarity index 100%
rename from test/registered/attention/unittest/dsv4/README.md
rename to test/registered/attention/unittests/dsv4/README.md
diff --git a/test/registered/attention/unittest/dsv4/__init__.py b/test/registered/attention/unittests/dsv4/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/dsv4/__init__.py
rename to test/registered/attention/unittests/dsv4/__init__.py
diff --git a/test/registered/attention/unittest/dsv4/test_deepseek_v4.py b/test/registered/attention/unittests/dsv4/test_deepseek_v4.py
similarity index 100%
rename from test/registered/attention/unittest/dsv4/test_deepseek_v4.py
rename to test/registered/attention/unittests/dsv4/test_deepseek_v4.py
diff --git a/test/registered/attention/unittest/dual_chunk/README.md b/test/registered/attention/unittests/dual_chunk/README.md
similarity index 100%
rename from test/registered/attention/unittest/dual_chunk/README.md
rename to test/registered/attention/unittests/dual_chunk/README.md
diff --git a/test/registered/attention/unittest/dual_chunk/__init__.py b/test/registered/attention/unittests/dual_chunk/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/dual_chunk/__init__.py
rename to test/registered/attention/unittests/dual_chunk/__init__.py
diff --git a/test/registered/attention/unittest/dual_chunk/test_dual_chunk_flash_attn.py b/test/registered/attention/unittests/dual_chunk/test_dual_chunk_flash_attn.py
similarity index 100%
rename from test/registered/attention/unittest/dual_chunk/test_dual_chunk_flash_attn.py
rename to test/registered/attention/unittests/dual_chunk/test_dual_chunk_flash_attn.py
diff --git a/test/registered/attention/unittest/gdn/README.md b/test/registered/attention/unittests/gdn/README.md
similarity index 100%
rename from test/registered/attention/unittest/gdn/README.md
rename to test/registered/attention/unittests/gdn/README.md
diff --git a/test/registered/attention/unittest/gdn/__init__.py b/test/registered/attention/unittests/gdn/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/gdn/__init__.py
rename to test/registered/attention/unittests/gdn/__init__.py
diff --git a/test/registered/attention/unittest/gdn/test_flashinfer.py b/test/registered/attention/unittests/gdn/test_flashinfer.py
similarity index 100%
rename from test/registered/attention/unittest/gdn/test_flashinfer.py
rename to test/registered/attention/unittests/gdn/test_flashinfer.py
diff --git a/test/registered/attention/unittest/gdn/test_torch_native.py b/test/registered/attention/unittests/gdn/test_torch_native.py
similarity index 100%
rename from test/registered/attention/unittest/gdn/test_torch_native.py
rename to test/registered/attention/unittests/gdn/test_torch_native.py
diff --git a/test/registered/attention/unittest/gdn/test_triton.py b/test/registered/attention/unittests/gdn/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/gdn/test_triton.py
rename to test/registered/attention/unittests/gdn/test_triton.py
diff --git a/test/registered/attention/unittest/kda/README.md b/test/registered/attention/unittests/kda/README.md
similarity index 100%
rename from test/registered/attention/unittest/kda/README.md
rename to test/registered/attention/unittests/kda/README.md
diff --git a/test/registered/attention/unittest/kda/__init__.py b/test/registered/attention/unittests/kda/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/kda/__init__.py
rename to test/registered/attention/unittests/kda/__init__.py
diff --git a/test/registered/attention/unittest/kda/test_triton.py b/test/registered/attention/unittests/kda/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/kda/test_triton.py
rename to test/registered/attention/unittests/kda/test_triton.py
diff --git a/test/registered/attention/unittest/lightning/README.md b/test/registered/attention/unittests/lightning/README.md
similarity index 100%
rename from test/registered/attention/unittest/lightning/README.md
rename to test/registered/attention/unittests/lightning/README.md
diff --git a/test/registered/attention/unittest/lightning/__init__.py b/test/registered/attention/unittests/lightning/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/lightning/__init__.py
rename to test/registered/attention/unittests/lightning/__init__.py
diff --git a/test/registered/attention/unittest/lightning/test_triton.py b/test/registered/attention/unittests/lightning/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/lightning/test_triton.py
rename to test/registered/attention/unittests/lightning/test_triton.py
diff --git a/test/registered/attention/unittest/mamba/README.md b/test/registered/attention/unittests/mamba/README.md
similarity index 100%
rename from test/registered/attention/unittest/mamba/README.md
rename to test/registered/attention/unittests/mamba/README.md
diff --git a/test/registered/attention/unittest/mamba/__init__.py b/test/registered/attention/unittests/mamba/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/mamba/__init__.py
rename to test/registered/attention/unittests/mamba/__init__.py
diff --git a/test/registered/attention/unittest/mamba/test_mamba2.py b/test/registered/attention/unittests/mamba/test_mamba2.py
similarity index 100%
rename from test/registered/attention/unittest/mamba/test_mamba2.py
rename to test/registered/attention/unittests/mamba/test_mamba2.py
diff --git a/test/registered/attention/unittest/mla/README.md b/test/registered/attention/unittests/mla/README.md
similarity index 100%
rename from test/registered/attention/unittest/mla/README.md
rename to test/registered/attention/unittests/mla/README.md
diff --git a/test/registered/attention/unittest/mla/__init__.py b/test/registered/attention/unittests/mla/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/mla/__init__.py
rename to test/registered/attention/unittests/mla/__init__.py
diff --git a/test/registered/attention/unittest/mla/test_cutlass_mla.py b/test/registered/attention/unittests/mla/test_cutlass_mla.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_cutlass_mla.py
rename to test/registered/attention/unittests/mla/test_cutlass_mla.py
diff --git a/test/registered/attention/unittest/mla/test_flashinfer.py b/test/registered/attention/unittests/mla/test_flashinfer.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_flashinfer.py
rename to test/registered/attention/unittests/mla/test_flashinfer.py
diff --git a/test/registered/attention/unittest/mla/test_flashmla.py b/test/registered/attention/unittests/mla/test_flashmla.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_flashmla.py
rename to test/registered/attention/unittests/mla/test_flashmla.py
diff --git a/test/registered/attention/unittest/mla/test_tokenspeed_mla.py b/test/registered/attention/unittests/mla/test_tokenspeed_mla.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_tokenspeed_mla.py
rename to test/registered/attention/unittests/mla/test_tokenspeed_mla.py
diff --git a/test/registered/attention/unittest/mla/test_triton.py b/test/registered/attention/unittests/mla/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_triton.py
rename to test/registered/attention/unittests/mla/test_triton.py
diff --git a/test/registered/attention/unittest/mla/test_trtllm_mla.py b/test/registered/attention/unittests/mla/test_trtllm_mla.py
similarity index 100%
rename from test/registered/attention/unittest/mla/test_trtllm_mla.py
rename to test/registered/attention/unittests/mla/test_trtllm_mla.py
diff --git a/test/registered/attention/unittest/swa/README.md b/test/registered/attention/unittests/swa/README.md
similarity index 100%
rename from test/registered/attention/unittest/swa/README.md
rename to test/registered/attention/unittests/swa/README.md
diff --git a/test/registered/attention/unittest/swa/__init__.py b/test/registered/attention/unittests/swa/__init__.py
similarity index 100%
rename from test/registered/attention/unittest/swa/__init__.py
rename to test/registered/attention/unittests/swa/__init__.py
diff --git a/test/registered/attention/unittest/swa/test_flashinfer.py b/test/registered/attention/unittests/swa/test_flashinfer.py
similarity index 100%
rename from test/registered/attention/unittest/swa/test_flashinfer.py
rename to test/registered/attention/unittests/swa/test_flashinfer.py
diff --git a/test/registered/attention/unittest/swa/test_torch_native.py b/test/registered/attention/unittests/swa/test_torch_native.py
similarity index 100%
rename from test/registered/attention/unittest/swa/test_torch_native.py
rename to test/registered/attention/unittests/swa/test_torch_native.py
diff --git a/test/registered/attention/unittest/swa/test_triton.py b/test/registered/attention/unittests/swa/test_triton.py
similarity index 100%
rename from test/registered/attention/unittest/swa/test_triton.py
rename to test/registered/attention/unittests/swa/test_triton.py