diff --git a/reference/hwapi/functions/hwapi-attribute.xml b/reference/hwapi/functions/hwapi-attribute-new.xml
similarity index 92%
rename from reference/hwapi/functions/hwapi-attribute.xml
rename to reference/hwapi/functions/hwapi-attribute-new.xml
index 36a6ae7b27..9dd19923f5 100644
--- a/reference/hwapi/functions/hwapi-attribute.xml
+++ b/reference/hwapi/functions/hwapi-attribute-new.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.hwapi-attribute">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.hwapi-attribute-new">
  <refnamediv>
-  <refname>hw_api_attribute</refname>
+  <refname>hwapi_attribute_new</refname>
   <refpurpose>Creates instance of class hw_api_attribute</refpurpose>
  </refnamediv>
  
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>HW_API_Attribute</type><methodname>hw_api_attribute</methodname>
+   <type>HW_API_Attribute</type><methodname>hwapi_attribute_new</methodname>
    <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/hwapi/functions/hwapi-new-content.xml b/reference/hwapi/functions/hwapi-content-new.xml
similarity index 92%
rename from reference/hwapi/functions/hwapi-new-content.xml
rename to reference/hwapi/functions/hwapi-content-new.xml
index 0fee0738a7..d13266f69f 100644
--- a/reference/hwapi/functions/hwapi-new-content.xml
+++ b/reference/hwapi/functions/hwapi-content-new.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.hwapi-new-content">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.hwapi-content-new">
  <refnamediv>
-  <refname>hw_api_content</refname>
+  <refname>hwapi_content_new</refname>
   <refpurpose>Create new instance of class hw_api_content</refpurpose>
  </refnamediv>
  
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>HW_API_Content</type><methodname>hw_api_content</methodname>
+   <type>HW_API_Content</type><methodname>hwapi_content_new</methodname>
    <methodparam><type>string</type><parameter>content</parameter></methodparam>
    <methodparam><type>string</type><parameter>mimetype</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/hwapi/functions/hwapi-object-new.xml b/reference/hwapi/functions/hwapi-object-new.xml
index b6843728a7..0f972dca74 100644
--- a/reference/hwapi/functions/hwapi-object-new.xml
+++ b/reference/hwapi/functions/hwapi-object-new.xml
@@ -2,14 +2,14 @@
 <!-- $Revision$ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.hwapi-object-new">
  <refnamediv>
-  <refname>hw_api_object</refname>
-  <refpurpose>Creates a new instance of class hw_api_object</refpurpose>
+  <refname>hwapi_object_new</refname>
+  <refpurpose>Creates a new instance of class hwapi_object_new</refpurpose>
  </refnamediv>
  
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>hw_api_object</type><methodname>hw_api_object</methodname>
+   <type>hw_api_object</type><methodname>hwapi_object_new</methodname>
    <methodparam><type>array</type><parameter>parameter</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/hwapi/reference.xml b/reference/hwapi/reference.xml
index 84fb5719d6..b995463933 100644
--- a/reference/hwapi/reference.xml
+++ b/reference/hwapi/reference.xml
@@ -127,8 +127,8 @@
    </section>
   </partintro>
 
-&reference.hwapi.entities.hw-api-attribute;
 &reference.hwapi.entities.hw-api;
+&reference.hwapi.entities.hw-api-attribute;
 &reference.hwapi.entities.hw-api-content;
 &reference.hwapi.entities.hw-api-error;
 &reference.hwapi.entities.hw-api-object;