4 files changed, 26 insertions, 26 deletions

diff --git a/build.zig b/build.zig
index 16ffc1e..c3d9fe0 100644
--- a/build.zig
+++ b/build.zig
@@ -194,8 +194,8 @@ pub fn build(b: *std.Build) void {
     norm_data.addImport("HangulData", hangul_data);
     norm_data.addImport("NormPropsData", normp_data);
 
-    const norm = b.addModule("Normalizer", .{
-        .root_source_file = .{ .path = "src/Normalizer.zig" },
+    const norm = b.addModule("Normalize", .{
+        .root_source_file = .{ .path = "src/Normalize.zig" },
         .target = target,
         .optimize = optimize,
     });
@@ -219,14 +219,14 @@ pub fn build(b: *std.Build) void {
     });
     fold_data.addAnonymousImport("fold", .{ .root_source_file = fold_gen_out });
 
-    const folder = b.addModule("Folder", .{
-        .root_source_file = .{ .path = "src/Folder.zig" },
+    const case_fold = b.addModule("CaseFold", .{
+        .root_source_file = .{ .path = "src/CaseFold.zig" },
         .target = target,
         .optimize = optimize,
     });
-    folder.addImport("ascii", ascii);
-    folder.addImport("FoldData", fold_data);
-    folder.addImport("Normalizer", norm);
+    case_fold.addImport("ascii", ascii);
+    case_fold.addImport("FoldData", fold_data);
+    case_fold.addImport("Normalize", norm);
 
     // Benchmark rig
     const exe = b.addExecutable(.{
@@ -241,8 +241,8 @@ pub fn build(b: *std.Build) void {
     // exe.root_module.addImport("code_point", code_point);
     // exe.root_module.addImport("grapheme", grapheme);
     // exe.root_module.addImport("DisplayWidth", display_width);
-    exe.root_module.addImport("Normalizer", norm);
-    // exe.root_module.addImport("Folder", folder);
+    exe.root_module.addImport("Normalize", norm);
+    // exe.root_module.addImport("CaseFold", case_fold);
     // exe.root_module.addImport("GenCatData", gencat_data);
     b.installArtifact(exe);
 
@@ -255,7 +255,7 @@ pub fn build(b: *std.Build) void {
 
     // Tests
     const exe_unit_tests = b.addTest(.{
-        .root_source_file = .{ .path = "src/Folder.zig" },
+        .root_source_file = .{ .path = "src/CaseFold.zig" },
         .target = target,
         .optimize = optimize,
     });
@@ -267,7 +267,7 @@ pub fn build(b: *std.Build) void {
     // exe_unit_tests.root_module.addAnonymousImport("normp", .{ .root_source_file = normp_gen_out });
     // exe_unit_tests.root_module.addImport("DisplayWidthData", dw_data);
     exe_unit_tests.root_module.addImport("NormData", norm_data);
-    exe_unit_tests.root_module.addImport("Normalizer", norm);
+    exe_unit_tests.root_module.addImport("Normalize", norm);
     exe_unit_tests.root_module.addImport("FoldData", fold_data);
     // exe_unit_tests.filter = "nfd !ASCII";
 
diff --git a/src/Folder.zig b/src/CaseFold.zig
index 43a3a5b..e00d03b 100644
--- a/src/Folder.zig
+++ b/src/CaseFold.zig
@@ -4,7 +4,7 @@ const testing = std.testing;
 
 const ascii = @import("ascii");
 pub const FoldData = @import("FoldData");
-const Normalizer = @import("Normalizer");
+const Normalize = @import("Normalize");
 
 fold_data: *const FoldData,
 
@@ -40,7 +40,7 @@ fn changesWhenCaseFolded(self: Self, cps: []const u21) bool {
 pub fn compatCaselessMatch(
     self: Self,
     allocator: mem.Allocator,
-    normalizer: *const Normalizer,
+    normalizer: *const Normalize,
     a: []const u8,
     b: []const u8,
 ) !bool {
@@ -90,9 +90,9 @@ pub fn compatCaselessMatch(
 test "compatCaselessMatch" {
     const allocator = testing.allocator;
 
-    var norm_data = try Normalizer.NormData.init(allocator);
+    var norm_data = try Normalize.NormData.init(allocator);
     defer norm_data.deinit();
-    const n = Normalizer{ .norm_data = &norm_data };
+    const n = Normalize{ .norm_data = &norm_data };
 
     var fold_data = try FoldData.init(allocator);
     defer fold_data.deinit();
@@ -111,7 +111,7 @@ test "compatCaselessMatch" {
 pub fn canonCaselessMatch(
     self: Self,
     allocator: mem.Allocator,
-    normalizer: *const Normalizer,
+    normalizer: *const Normalize,
     a: []const u8,
     b: []const u8,
 ) !bool {
@@ -163,9 +163,9 @@ pub fn canonCaselessMatch(
 test "canonCaselessMatch" {
     const allocator = testing.allocator;
 
-    var norm_data = try Normalizer.NormData.init(allocator);
+    var norm_data = try Normalize.NormData.init(allocator);
     defer norm_data.deinit();
-    const n = Normalizer{ .norm_data = &norm_data };
+    const n = Normalize{ .norm_data = &norm_data };
 
     var fold_data = try FoldData.init(allocator);
     defer fold_data.deinit();
diff --git a/src/Normalizer.zig b/src/Normalize.zig
index b5a54d1..b5a54d1 100644
--- a/src/Normalizer.zig
+++ b/src/Normalize.zig
diff --git a/src/main.zig b/src/main.zig
index f42f0b1..0b0d550 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -16,10 +16,10 @@ const std = @import("std");
 // const ascii = @import("ascii");
 // const ascii = std.ascii;
 
-// const Normalizer = @import("ziglyph").Normalizer;
-const Normalizer = @import("Normalizer");
+// const Normalize = @import("ziglyph").Normalizer;
+const Normalize = @import("Normalize");
 
-// const Caser = @import("Caser");
+// const CaseFold = @import("CaseFold");
 
 // const GenCatData = @import("GenCatData");
 
@@ -39,18 +39,18 @@ pub fn main() !void {
     );
     defer allocator.free(input);
 
-    var norm_data = try Normalizer.NormData.init(allocator);
+    var norm_data = try Normalize.NormData.init(allocator);
     defer norm_data.deinit();
-    var norm = Normalizer{ .norm_data = &norm_data };
-    // var norm = try Normalizer.init(allocator);
+    var norm = Normalize{ .norm_data = &norm_data };
+    // var norm = try Normalize.init(allocator);
     // defer norm.deinit();
 
     // var gencat_data = try GenCatData.init(allocator);
     // defer gencat_data.deinit();
 
-    // var fold_data = try Caser.FoldData.init(allocator);
+    // var fold_data = try CaseFold.FoldData.init(allocator);
     // defer fold_data.deinit();
-    // var caser = Caser{ .fold_data = &fold_data };
+    // var caser = CaseFold{ .fold_data = &fold_data };
 
     // var iter = GraphemeIterator.init(input, &data);
     // defer iter.deinit();