diff --git a/reference/sockets/functions.xml b/reference/sockets/functions.xml
index 0075e648a9..e491bd9b6f 100644
--- a/reference/sockets/functions.xml
+++ b/reference/sockets/functions.xml
@@ -6,7 +6,7 @@
 &reference.sockets.functions.socket-create;
 &reference.sockets.functions.socket-create-listen;
 &reference.sockets.functions.socket-create-pair;
-&reference.sockets.functions.socket-getopt;
+&reference.sockets.functions.socket-get-option;
 &reference.sockets.functions.socket-getpeername;
 &reference.sockets.functions.socket-getsockname;
 &reference.sockets.functions.socket-iovec-add;
@@ -27,7 +27,7 @@
 &reference.sockets.functions.socket-sendmsg;
 &reference.sockets.functions.socket-sendto;
 &reference.sockets.functions.socket-set-nonblock;
-&reference.sockets.functions.socket-setopt;
+&reference.sockets.functions.socket-set-option;
 &reference.sockets.functions.socket-shutdown;
 &reference.sockets.functions.socket-strerror;
 &reference.sockets.functions.socket-write;
diff --git a/reference/sockets/functions/socket-getopt.xml b/reference/sockets/functions/socket-get-option.xml
similarity index 86%
rename from reference/sockets/functions/socket-getopt.xml
rename to reference/sockets/functions/socket-get-option.xml
index 2f9d1508db..4085b0d0d5 100644
--- a/reference/sockets/functions/socket-getopt.xml
+++ b/reference/sockets/functions/socket-get-option.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
-  <refentry id="function.socket-getopt">
+  <refentry id="function.socket-get_option">
    <refnamediv>
-    <refname>socket_getopt</refname>
+    <refname>socket_get_option</refname>
     <refpurpose>Gets socket options for the socket </refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>mixed</type><methodname>socket_getopt</methodname>
+      <type>mixed</type><methodname>socket_get_option</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
       <methodparam><type>int</type><parameter>level</parameter></methodparam>
       <methodparam><type>int</type><parameter>optname</parameter></methodparam>
diff --git a/reference/sockets/functions/socket-setopt.xml b/reference/sockets/functions/socket-set-option.xml
similarity index 86%
rename from reference/sockets/functions/socket-setopt.xml
rename to reference/sockets/functions/socket-set-option.xml
index 14f94d9438..a7eb4523b9 100644
--- a/reference/sockets/functions/socket-setopt.xml
+++ b/reference/sockets/functions/socket-set-option.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
-  <refentry id="function.socket-setopt">
+  <refentry id="function.socket-set_option">
    <refnamediv>
-    <refname>socket_setopt</refname>
+    <refname>socket_set_option</refname>
     <refpurpose>Sets socket options for the socket</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>bool</type><methodname>socket_setopt</methodname>
+      <type>bool</type><methodname>socket_set_option</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
       <methodparam><type>int</type><parameter>level</parameter></methodparam>
       <methodparam><type>int</type><parameter>optname</parameter></methodparam>