diff --git a/source/tools/entity/checkrefs.pl b/source/tools/entity/checkrefs.pl
index 852aaaacc4..96370df373 100755
--- a/source/tools/entity/checkrefs.pl
+++ b/source/tools/entity/checkrefs.pl
@@ -435,8 +435,8 @@ sub add_gui_xml
     {
         push @files, $f;
 
-        # GUI page definitions are assumed to be named page_[something].xml and alone in that.
-        if ($f =~ /\/page_[^.\/]+\.xml$/)
+        # GUI page definitions are assumed to be named page[_something].xml and alone in that.
+        if ($f =~ /\/page(_[^.\/]+)?\.xml$/)
         {
             push @roots, $f;
             my $xml = XMLin(vfs_to_physical($f), ForceArray => [qw(include)], KeyAttr => []) or die "Failed to parse '$f': $!";
diff --git a/source/tools/xmlvalidator/validate.pl b/source/tools/xmlvalidator/validate.pl
index 6f5739782a..07277cf201 100644
--- a/source/tools/xmlvalidator/validate.pl
+++ b/source/tools/xmlvalidator/validate.pl
@@ -98,8 +98,8 @@ sub validate_guis
     my (@guipages, @guixmls);
     for my $f (@files)
     {
-        # GUI page definitions are assumed to be named page_[something].xml and alone in that.
-        if ($f =~ /\/page_[^.\/]+\.xml$/)
+        # GUI page definitions are assumed to be named page[_something].xml and alone in that.
+        if ($f =~ /\/page(_[^.\/]+)?\.xml$/)
         {
             push @guipages, $f;
         }