diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index e1df4b7883..78ac5d5634 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -76,11 +76,11 @@ function(hljs) {
 
   var TITLE_MODE = {
     className: 'title',
-    begin: '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE,
+    begin: optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
 
-  var FUNCTION_TITLE = '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE + '\\s*\\(';
+  var FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
 
   var CPP_KEYWORDS = {
     keyword: 'int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof ' +