diff --git a/example/ck_tile/01_unified_attention/example_unified_attention.cpp b/example/ck_tile/01_unified_attention/example_unified_attention.cpp
index 558dba164a..dc0e389f0a 100644
--- a/example/ck_tile/01_unified_attention/example_unified_attention.cpp
+++ b/example/ck_tile/01_unified_attention/example_unified_attention.cpp
@@ -22,8 +22,7 @@
 #include <ck_tile/host/reference/reference_batched_masking.hpp>
 #include <ck_tile/host/reference/reference_batched_softmax.hpp>
 
-#include "fmha_fwd.hpp"
-#include "fmha_fwd_v3.hpp"
+#include "unified_attention.hpp"
 #include "mask.hpp"
 
 auto parse_cmd_args(int argc, char* argv[]) -> std::pair<bool, ck_tile::ArgParser>
diff --git a/example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_bf16_mask.cpp b/example/ck_tile/01_unified_attention/instances/unified_attention_d128_bf16_mask.cpp
similarity index 100%
rename from example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_bf16_mask.cpp
rename to example/ck_tile/01_unified_attention/instances/unified_attention_d128_bf16_mask.cpp
diff --git a/example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_bf16_nmask.cpp b/example/ck_tile/01_unified_attention/instances/unified_attention_d128_bf16_nmask.cpp
similarity index 100%
rename from example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_bf16_nmask.cpp
rename to example/ck_tile/01_unified_attention/instances/unified_attention_d128_bf16_nmask.cpp
diff --git a/example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_fp16_mask.cpp b/example/ck_tile/01_unified_attention/instances/unified_attention_d128_fp16_mask.cpp
similarity index 100%
rename from example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_fp16_mask.cpp
rename to example/ck_tile/01_unified_attention/instances/unified_attention_d128_fp16_mask.cpp
diff --git a/example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_fp16_nmask.cpp b/example/ck_tile/01_unified_attention/instances/unified_attention_d128_fp16_nmask.cpp
similarity index 100%
rename from example/ck_tile/01_unified_attention/instances/fmha_fwd_v3_d128_fp16_nmask.cpp
rename to example/ck_tile/01_unified_attention/instances/unified_attention_d128_fp16_nmask.cpp
diff --git a/example/ck_tile/01_unified_attention/unified_attention_runner.hpp b/example/ck_tile/01_unified_attention/unified_attention_runner.hpp
index 0703af71e3..7da84b8a92 100644
--- a/example/ck_tile/01_unified_attention/unified_attention_runner.hpp
+++ b/example/ck_tile/01_unified_attention/unified_attention_runner.hpp
@@ -5,7 +5,7 @@
 
 #include "ck_tile/host.hpp"
 #include "ck_tile/ref/naive_attention.hpp"
-#include "fmha_fwd.hpp"
+#include "unified_attention.hpp"
 #include "utils.hpp"
 #include "ck_tile/utility/json_dump.hpp"
 
diff --git a/include/ck_tile/ops/unified_attention/pipeline/tile_unified_attention_traits.hpp b/include/ck_tile/ops/unified_attention/pipeline/tile_unified_attention_traits.hpp
index 682e93fd56..a285c30876 100644
--- a/include/ck_tile/ops/unified_attention/pipeline/tile_unified_attention_traits.hpp
+++ b/include/ck_tile/ops/unified_attention/pipeline/tile_unified_attention_traits.hpp
@@ -21,4 +21,4 @@ struct TileUnifiedAttentionTraits
     static constexpr bool kStoreLSE      = kStoreLSE_;
     static constexpr index_t kBlockPerCu = kBlockPerCu_;
 };
-}
\ No newline at end of file
+}
diff --git a/include/ck_tile/ops/unified_attention/pipeline/unified_attention_pipeline_problem.hpp b/include/ck_tile/ops/unified_attention/pipeline/unified_attention_pipeline_problem.hpp
index 3a8975b160..3f676bf01d 100644
--- a/include/ck_tile/ops/unified_attention/pipeline/unified_attention_pipeline_problem.hpp
+++ b/include/ck_tile/ops/unified_attention/pipeline/unified_attention_pipeline_problem.hpp
@@ -57,4 +57,4 @@ struct UnifiedAttentionPipelineProblem
     static constexpr bool kDoFp8StaticQuant = Traits::kDoFp8StaticQuant;
     static constexpr index_t kBlockPerCu    = Traits::kBlockPerCu;
 };
-}
\ No newline at end of file
+}