diff --git a/entities/global.ent b/entities/global.ent
index d7a9db91d..457418836 100644
--- a/entities/global.ent
+++ b/entities/global.ent
@@ -643,7 +643,7 @@
 <!ENTITY email.sample                'yourname@example.com'>
 
 <!ENTITY link.superglobals '<link xmlns="http://docbook.org/ns/docbook" linkend="language.variables.predefined">superglobals</link>'>
-<!ENTITY link.autoload '<link xmlns="http://docbook.org/ns/docbook" linkend="language.oop5.autoload">__autoload</link>'>
+<!ENTITY link.autoload '<link xmlns="http://docbook.org/ns/docbook" linkend="language.oop.autoload">__autoload</link>'>
 
 <!ENTITY link.pecl '<link xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.pecl;">PECL</link>'>
 
@@ -686,7 +686,7 @@
 <!ENTITY foreach '<link xmlns="http://docbook.org/ns/docbook" linkend="control-structures.foreach"><literal>foreach</literal></link>'>
 <!ENTITY global '<link xmlns="http://docbook.org/ns/docbook" linkend="language.variables.scope.global"><literal>global</literal></link>'>
 <!ENTITY instanceof '<link xmlns="http://docbook.org/ns/docbook" linkend="language.operators.type"><literal>instanceof</literal></link>'>
-<!ENTITY new '<link xmlns="http://docbook.org/ns/docbook" linkend="language.oop5.basic.new"><literal>new</literal></link>'>
+<!ENTITY new '<link xmlns="http://docbook.org/ns/docbook" linkend="language.oop.basic.new"><literal>new</literal></link>'>
 <!ENTITY yield '<link xmlns="http://docbook.org/ns/docbook" linkend="control-structures.yield"><literal>yield</literal></link>'>
 <!ENTITY yield.from '<link xmlns="http://docbook.org/ns/docbook" linkend="control-structures.yield.from"><literal>yield from</literal></link>'>
 
diff --git a/manual.xml.in b/manual.xml.in
index cab804301..8031a1895 100644
--- a/manual.xml.in
+++ b/manual.xml.in
@@ -75,7 +75,7 @@
   &language.operators;
   &language.control-structures;
   &language.functions;
-  &language.oop5;
+  &language.oop;
   &language.namespaces;
   &language.errors;
   &language.exceptions;
diff --git a/scripts/check-examples.php b/scripts/check-examples.php
index c968649e9..d7043538a 100644
--- a/scripts/check-examples.php
+++ b/scripts/check-examples.php
@@ -198,9 +198,9 @@ function is_known_failure($filename) {
 		'language/exceptions.xml',
 		'language/namespaces.xml',
 		'language/oop.xml',
-		'language/oop5/basic.xml',
-		'language/oop5/final.xml',
-		'language/oop5/reflection.xml',
+		'language/oop/basic.xml',
+		'language/oop/final.xml',
+		'language/oop/reflection.xml',
 		'language/references.xml',
 		'language/variables.xml',
 		'language/types/array.xml',
@@ -225,4 +225,4 @@ function usage() {
 	echo "Example: php {$_SERVER['argv'][0]} -p /cvs/phpdoc/en -t /tmp\n";
 	echo "Optional: -o to load files in EDITOR (" . $_SERVER['EDITOR'] . ") or -o /path/to/editor\n";
 	exit;
-}
\ No newline at end of file
+}