diff --git a/Lib/ruby/ruby.swg b/Lib/ruby/ruby.swg
index fb21b92a5..8730bebb2 100644
--- a/Lib/ruby/ruby.swg
+++ b/Lib/ruby/ruby.swg
@@ -19,7 +19,7 @@
 
 /* Method names should be changed so that they are 
    lower_case_with_underscores */
-%rename("%(undercase)s", %isfunction, %ismember, %isnotmemberget, %isnotmemberset) "";
+%rename("%(undercase)s", %isfunction, %ismember, %not %ismemberget, %not %ismemberset) "";
 #endif
 
 /* ------------------------------------------------------------
diff --git a/Lib/swig.swg b/Lib/swig.swg
index 9e57d0b8a..7136a7b9e 100644
--- a/Lib/swig.swg
+++ b/Lib/swig.swg
@@ -230,46 +230,44 @@ static int NAME(TYPE x) {
 
 */
 
-%define %isenum         match="enum"  %enddef
-%define %isenumitem     match="enumitem"  %enddef
-%define %isaccess       match="access"   %enddef
-%define %isclass        match="class"   %enddef
-%define %isextend       match="extend"  %enddef
-%define %isextend       match="extend"  %enddef
-%define %isconstructor  match="constructor"  %enddef
-%define %isdestructor   match="destructor"  %enddef
-%define %isnamespace    match="namespace"  %enddef
-%define %istemplate     match="template"  %enddef
-%define %isconstant     match="constant"  %enddef  /* %constant definition */
+%define %not            "not" %enddef 
+%define %isenum         "match"="enum"  %enddef
+%define %isenumitem     "match"="enumitem"  %enddef
+%define %isaccess       "match"="access"   %enddef
+%define %isclass        "match"="class"   %enddef
+%define %isextend       "match"="extend"  %enddef
+%define %isextend       "match"="extend"  %enddef
+%define %isconstructor  "match"="constructor"  %enddef
+%define %isdestructor   "match"="destructor"  %enddef
+%define %isnamespace    "match"="namespace"  %enddef
+%define %istemplate     "match"="template"  %enddef
+%define %isconstant     "match"="constant"  %enddef  /* %constant definition */
 
-%define %isunion        match$kind="union"  %enddef
-%define %isfunction     match$kind="function"  %enddef
-%define %isvariable     match$kind="variable"  %enddef
+%define %isunion        "match$kind"="union"  %enddef
+%define %isfunction     "match$kind"="function"  %enddef
+%define %isvariable     "match$kind"="variable"  %enddef
 %define %isimmutable    "match$feature:immutable"="1"  %enddef
-%define %hasconsttype   match$hasconsttype="1"  %enddef
-%define %hasvalue       match$hasvalue="1"  %enddef
-%define %isextension    match$isextension="1"  %enddef
+%define %hasconsttype   "match$hasconsttype"="1"  %enddef
+%define %hasvalue       "match$hasvalue"="1"  %enddef
+%define %isextension    "match$isextension"="1"  %enddef
 
-%define %isstatic       match$storage="static"  %enddef
-%define %isfriend       match$storage="friend"  %enddef
-%define %istypedef      match$storage="typedef"  %enddef
-%define %isvirtual      match$storage="virtual"  %enddef
-%define %isexplicit     match$storage="explicit"  %enddef
-%define %isextern       match$storage="extern"  %enddef
+%define %isstatic       "match$storage"="static"  %enddef
+%define %isfriend       "match$storage"="friend"  %enddef
+%define %istypedef      "match$storage"="typedef"  %enddef
+%define %isvirtual      "match$storage"="virtual"  %enddef
+%define %isexplicit     "match$storage"="explicit"  %enddef
+%define %isextern       "match$storage"="extern"  %enddef
 
-%define %ismember       match$ismember="1"  %enddef
-%define %isglobal       notmatch$ismember="1"  %enddef
-%define %innamespace    match$parentNode$nodeType="namespace"  %enddef
+%define %ismember       "match$ismember"="1"  %enddef
+%define %isglobal       %not %ismember  %enddef
+%define %innamespace    "match$parentNode$nodeType"="namespace"  %enddef
 
-%define %ispublic       match$access="public"  %enddef
-%define %isprotected    match$access="protected"  %enddef
-%define %isprivate      match$access="public"  %enddef
+%define %ispublic       "match$access"="public"  %enddef
+%define %isprotected    "match$access"="protected"  %enddef
+%define %isprivate      "match$access"="public"  %enddef
 
-
-%define %ismemberget      match$memberget="1"  %enddef
-%define %ismemberset      match$memberset="1"  %enddef
-%define %isnotmemberget   notmatch$memberget="1"  %enddef
-%define %isnotmemberset   notmatch$memberset="1"  %enddef
+%define %ismemberget    "match$memberget"="1"  %enddef
+%define %ismemberset    "match$memberset"="1"  %enddef
 
 %define %classname      %ismember,match$parentNode$name  %enddef