diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 92e28dd61880333f95f1bbd90d4cb719075190ea..948132f539bd638b914ff2d05a89bce32ce0be82 100644
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -560,7 +560,7 @@
    Table, column, type, function, and view names are stored in system
    tables in columns of type Name. Name is a fixed-length,
    null-terminated type of NAMEDATALEN bytes. (The default value for
-   NAMEDATALEN is 32 bytes.)
+   NAMEDATALEN is 64 bytes.)
 typedef struct nameData
     {
         char        data[NAMEDATALEN];
diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 914eec43020eb8e3955d978b63097a6b704c03ba..6b2e1363f21e1235e35cadb601181c96bb3b5de2 100644
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/doc/src/FAQ/FAQ_DEV.html
@@ -671,7 +671,7 @@
     <P>Table, column, type, function, and view names are stored in
     system tables in columns of type <I>Name.</I> Name is a
     fixed-length, null-terminated type of <I>NAMEDATALEN</I> bytes.
-    (The default value for NAMEDATALEN is 32 bytes.)</P>
+    (The default value for NAMEDATALEN is 64 bytes.)</P>
 <PRE>
 <CODE>typedef struct nameData
     {
diff --git a/src/test/regress/expected/name.out b/src/test/regress/expected/name.out
index ce876c4eb394d7ec5024bbbf8f1ba2e0ccc73699..8cc09dae7442514f465712393c0b17a93e485151 100644
--- a/src/test/regress/expected/name.out
+++ b/src/test/regress/expected/name.out
@@ -1,6 +1,6 @@
 --
 -- NAME
--- all inputs are silently truncated at NAMEDATALEN (32) characters
+-- all inputs are silently truncated at NAMEDATALEN-1 (63) characters
 --
 -- fixed-length by reference
 SELECT name 'name string' = name 'name string' AS "True";
diff --git a/src/test/regress/sql/name.sql b/src/test/regress/sql/name.sql
index bcf3ac90feb1a563cd0e7ee7b2eb8b2910c387e0..58fa0120fda2699d525606e8aba312c90776b819 100644
--- a/src/test/regress/sql/name.sql
+++ b/src/test/regress/sql/name.sql
@@ -1,6 +1,6 @@
 --
 -- NAME
--- all inputs are silently truncated at NAMEDATALEN (32) characters
+-- all inputs are silently truncated at NAMEDATALEN-1 (63) characters
 --
 
 -- fixed-length by reference