4 files changed, 8 insertions, 11 deletions
diff --git a/src/packrat-lexer.adb b/src/packrat-lexers.adb
index 486aae5..fc63e4a 100644
--- a/src/packrat-lexer.adb
+++ b/src/packrat-lexers.adb
@@ -5,7 +5,7 @@ with
     Packrat.Errors;
 
 
-package body Packrat.Lexer is
+package body Packrat.Lexers is
 
 
     function Join
@@ -681,6 +681,6 @@ package body Packrat.Lexer is
     end Input_End;
 
 
-end Packrat.Lexer;
+end Packrat.Lexers;
 
 
diff --git a/src/packrat-lexer.ads b/src/packrat-lexers.ads
index b8090c9..57fc462 100644
--- a/src/packrat-lexer.ads
+++ b/src/packrat-lexers.ads
@@ -14,7 +14,7 @@ generic
 
     with package Traits is new Packrat.Traits (<>);
 
-package Packrat.Lexer is
+package Packrat.Lexers is
 
 
     type Combinator_Result is private;
@@ -322,6 +322,6 @@ private
         Allow_Incomplete => True);
 
 
-end Packrat.Lexer;
+end Packrat.Lexers;
 
 
diff --git a/src/packrat-util.adb b/src/packrat-utilities.adb
index c1335e0..97e4272 100644
--- a/src/packrat-util.adb
+++ b/src/packrat-utilities.adb
@@ -5,7 +5,7 @@ with
     Ada.Characters.Latin_1;
 
 
-package body Packrat.Util is
+package body Packrat.Utilities is
 
 
     package Latin renames Ada.Characters.Latin_1;
@@ -142,6 +142,6 @@ package body Packrat.Util is
     end Not_Whitespace;
 
 
-end Packrat.Util;
+end Packrat.Utilities;
 
 
diff --git a/src/packrat-util.ads b/src/packrat-utilities.ads
index cada441..15cd357 100644
--- a/src/packrat-util.ads
+++ b/src/packrat-utilities.ads
@@ -5,7 +5,7 @@ with
     Ada.Strings.Maps;
 
 
-package Packrat.Util is
+package Packrat.Utilities is
 
 
     generic
@@ -72,9 +72,6 @@ package Packrat.Util is
         return Boolean;
 
 
-private
-
-
-end Packrat.Util;
+end Packrat.Utilities;