diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index a065991da847..95af7bda31b3 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1774,11 +1774,11 @@ RDFElementImpl::ParseAttributeString(const nsString& aStr,
                                      nsIAtom*& aName, 
                                      PRInt32& aNameSpaceID)
 {
-static char kNameSpaceSeparator[] = ":";
+static char kNameSpaceSeparator = ':';
 
     nsAutoString prefix;
     nsAutoString name(aStr);
-    PRInt32 nsoffset = name.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = name.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         name.Left(prefix, nsoffset);
         name.Cut(0, nsoffset+1);
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index ec0fb1416109..79993a8b444b 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -4205,7 +4205,7 @@ XULDocumentImpl::ParseTagString(const nsString& aTagName, nsIAtom*& aName, PRInt
     // assigning "no namespace") in the case that there is no
     // namespace prefix present.
 
-static char kNameSpaceSeparator[] = ":";
+static char kNameSpaceSeparator = ':';
 
     // XXX this is a gross hack, but it'll carry us for now. We parse
     // the tag name using the root content, which presumably has all
@@ -4228,7 +4228,7 @@ static char kNameSpaceSeparator[] = ":";
 
     nsAutoString prefix;
     nsAutoString name(aTagName);
-    PRInt32 nsoffset = name.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = name.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         name.Left(prefix, nsoffset);
         name.Cut(0, nsoffset+1);
diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp
index 9b225391e45a..07c4a4de5dc0 100644
--- a/rdf/base/src/nsRDFContentSink.cpp
+++ b/rdf/base/src/nsRDFContentSink.cpp
@@ -78,7 +78,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static const char kNameSpaceSeparator[] = ":";
+static const char kNameSpaceSeparator = ':';
 static const char kNameSpaceDef[] = "xmlns";
 
 static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
@@ -838,7 +838,7 @@ RDFContentSinkImpl::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
 nsIAtom*
 RDFContentSinkImpl::CutNameSpacePrefix(nsString& aString)
 {
-    PRInt32 nsoffset = aString.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = aString.FindChar(kNameSpaceSeparator);
 
     if (nsoffset >= 0) {
         nsAutoString prefix;
diff --git a/rdf/content/src/nsRDFElement.cpp b/rdf/content/src/nsRDFElement.cpp
index a065991da847..95af7bda31b3 100644
--- a/rdf/content/src/nsRDFElement.cpp
+++ b/rdf/content/src/nsRDFElement.cpp
@@ -1774,11 +1774,11 @@ RDFElementImpl::ParseAttributeString(const nsString& aStr,
                                      nsIAtom*& aName, 
                                      PRInt32& aNameSpaceID)
 {
-static char kNameSpaceSeparator[] = ":";
+static char kNameSpaceSeparator = ':';
 
     nsAutoString prefix;
     nsAutoString name(aStr);
-    PRInt32 nsoffset = name.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = name.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         name.Left(prefix, nsoffset);
         name.Cut(0, nsoffset+1);
diff --git a/rdf/content/src/nsXULDocument.cpp b/rdf/content/src/nsXULDocument.cpp
index ec0fb1416109..79993a8b444b 100644
--- a/rdf/content/src/nsXULDocument.cpp
+++ b/rdf/content/src/nsXULDocument.cpp
@@ -4205,7 +4205,7 @@ XULDocumentImpl::ParseTagString(const nsString& aTagName, nsIAtom*& aName, PRInt
     // assigning "no namespace") in the case that there is no
     // namespace prefix present.
 
-static char kNameSpaceSeparator[] = ":";
+static char kNameSpaceSeparator = ':';
 
     // XXX this is a gross hack, but it'll carry us for now. We parse
     // the tag name using the root content, which presumably has all
@@ -4228,7 +4228,7 @@ static char kNameSpaceSeparator[] = ":";
 
     nsAutoString prefix;
     nsAutoString name(aTagName);
-    PRInt32 nsoffset = name.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = name.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         name.Left(prefix, nsoffset);
         name.Cut(0, nsoffset+1);
diff --git a/rdf/content/src/nsXULElement.cpp b/rdf/content/src/nsXULElement.cpp
index a065991da847..95af7bda31b3 100644
--- a/rdf/content/src/nsXULElement.cpp
+++ b/rdf/content/src/nsXULElement.cpp
@@ -1774,11 +1774,11 @@ RDFElementImpl::ParseAttributeString(const nsString& aStr,
                                      nsIAtom*& aName, 
                                      PRInt32& aNameSpaceID)
 {
-static char kNameSpaceSeparator[] = ":";
+static char kNameSpaceSeparator = ':';
 
     nsAutoString prefix;
     nsAutoString name(aStr);
-    PRInt32 nsoffset = name.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = name.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         name.Left(prefix, nsoffset);
         name.Cut(0, nsoffset+1);
diff --git a/rdf/datasource/src/nsXULContentSink.cpp b/rdf/datasource/src/nsXULContentSink.cpp
index 0899fda2b5e9..be4c9bcc80c1 100644
--- a/rdf/datasource/src/nsXULContentSink.cpp
+++ b/rdf/datasource/src/nsXULContentSink.cpp
@@ -84,7 +84,7 @@
 
 #include "nsHTMLTokens.h" // XXX so we can use nsIParserNode::GetTokenType()
 
-static const char kNameSpaceSeparator[] = ":";
+static const char kNameSpaceSeparator = ':';
 static const char kNameSpaceDef[] = "xmlns";
 static const char kXULID[] = "id";
 
@@ -1894,7 +1894,7 @@ nsIAtom*
 XULContentSinkImpl::CutNameSpacePrefix(nsString& aString)
 {
     nsAutoString  prefix;
-    PRInt32 nsoffset = aString.Find(kNameSpaceSeparator);
+    PRInt32 nsoffset = aString.FindChar(kNameSpaceSeparator);
     if (-1 != nsoffset) {
         aString.Left(prefix, nsoffset);
         aString.Cut(0, nsoffset+1);