diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am
index f65daed2..27af2669 100644
--- a/man/xkb/Makefile.am
+++ b/man/xkb/Makefile.am
@@ -160,7 +160,7 @@ libman_PRE = \
 	XkbResizeKeyActions.man                 \
 	XkbResizeKeySyms.man                    \
 	XkbResizeKeyType.man                    \
-	XkbSAActionSetCtrls.man                 \
+	XkbActionSetCtrls.man                   \
 	XkbSAGroup.man                          \
 	XkbSAPtrDfltValue.man                   \
 	XkbSARedirectSetVMods.man               \
diff --git a/man/xkb/XkbSAActionSetCtrls.man b/man/xkb/XkbActionSetCtrls.man
similarity index 96%
rename from man/xkb/XkbSAActionSetCtrls.man
rename to man/xkb/XkbActionSetCtrls.man
index efe08da5..67b20231 100644
--- a/man/xkb/XkbSAActionSetCtrls.man
+++ b/man/xkb/XkbActionSetCtrls.man
@@ -20,9 +20,9 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 .\" DEALINGS IN THE SOFTWARE.
 .\"
-.TH XkbSAActionSetCtrls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.TH XkbActionSetCtrls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
 .SH NAME
-XkbSAActionSetCtrls \- Sets the 
+XkbActionSetCtrls \- Sets the
 .I ctrls0 
 through 
 .I ctrls3
@@ -32,7 +32,7 @@ from
 .I ctrls
 .SH SYNOPSIS
 .HP
-.B void XkbSAActionSetCtrls
+.B void XkbActionSetCtrls
 .BI "(\^XkbCtrlsAction " "act" "\^,"
 .BI "unsigned int " "ctrls" "\^);"
 .if n .ti +5n
@@ -121,7 +121,7 @@ fields represent the boolean controls in the
 .I enabled_ctrls 
 field of the controls structure. Xkb macros, to convert between the two formats.
 
-.I XkbSAActionSetCtrls 
+.I XkbActionSetCtrls
 sets the 
 .I ctrls0 
 through 
diff --git a/specs/XKB/ch16.xml b/specs/XKB/ch16.xml
index 3f5e42f0..6b2a0381 100644
--- a/specs/XKB/ch16.xml
+++ b/specs/XKB/ch16.xml
@@ -2852,10 +2852,10 @@ converted to an unsigned int.
 </para>
 
 
-<indexterm significance="preferred" zone="XkbSAActionSetCtrls"><primary><function>XkbSAActionSetCtrls</function></primary></indexterm>
-<funcsynopsis id="XkbSAActionSetCtrls">
+<indexterm significance="preferred" zone="XkbActionSetCtrls"><primary><function>XkbActionSetCtrls</function></primary></indexterm>
+<funcsynopsis id="XkbActionSetCtrls">
   <funcprototype>
-    <funcdef>void <function>XkbSAActionSetCtrls</function></funcdef>
+    <funcdef>void <function>XkbActionSetCtrls</function></funcdef>
 <!-- (
 <parameter>act, ctrls</parameter>
 )                        /* macro */ -->
@@ -2888,7 +2888,7 @@ converted to an unsigned int.
 </variablelist>
 
 <para>
-<function>XkbSAActionSetCtrls</function>
+<function>XkbActionSetCtrls</function>
 sets the
 <structfield>ctrls0</structfield>
 through