Index: src/javax/sip/header/CallInfoHeader.java
===================================================================
--- src/javax/sip/header/CallInfoHeader.java	(revision 9128)
+++ src/javax/sip/header/CallInfoHeader.java	(working copy)
@@ -97,5 +97,5 @@
     /**
      * Name of CallInfoHeader
      */
-    public final static String NAME = "Call-Info";
+    public final static String NAME = "call-info";
 }
Index: src/javax/sip/header/CallIdHeader.java
===================================================================
--- src/javax/sip/header/CallIdHeader.java	(revision 9128)
+++ src/javax/sip/header/CallIdHeader.java	(working copy)
@@ -142,7 +142,7 @@
 
      */
 
-    public final static String NAME = "Call-ID";
+    public final static String NAME = "call-id";
 
 }
 
Index: src/javax/sip/header/ContactHeader.java
===================================================================
--- src/javax/sip/header/ContactHeader.java	(revision 9128)
+++ src/javax/sip/header/ContactHeader.java	(working copy)
@@ -208,7 +208,7 @@
 
      */
 
-    public final static String NAME = "Contact";
+    public final static String NAME = "contact";
 
 
 
Index: src/javax/sip/header/UserAgentHeader.java
===================================================================
--- src/javax/sip/header/UserAgentHeader.java	(revision 9128)
+++ src/javax/sip/header/UserAgentHeader.java	(working copy)
@@ -72,7 +72,7 @@
     /**
      * Name of UserAgentHeader
      */
-    public final static String NAME = "User-Agent";
+    public final static String NAME = "user-agent";
 
 }
 
Index: src/javax/sip/header/RouteHeader.java
===================================================================
--- src/javax/sip/header/RouteHeader.java	(revision 9128)
+++ src/javax/sip/header/RouteHeader.java	(working copy)
@@ -53,6 +53,6 @@
     /**
      * Name of RouteHeader
      */
-    public final static String NAME = "Route";
+    public final static String NAME = "route";
 }
 
Index: src/javax/sip/header/SubjectHeader.java
===================================================================
--- src/javax/sip/header/SubjectHeader.java	(revision 9128)
+++ src/javax/sip/header/SubjectHeader.java	(working copy)
@@ -105,7 +105,7 @@
 
      */
 
-    public final static String NAME = "Subject";
+    public final static String NAME = "subject";
 
 }
 
Index: src/javax/sip/header/ContentDispositionHeader.java
===================================================================
--- src/javax/sip/header/ContentDispositionHeader.java	(revision 9128)
+++ src/javax/sip/header/ContentDispositionHeader.java	(working copy)
@@ -115,27 +115,27 @@
     /**
      * Name of ContentDispositionHeader
      */
-    public final static String NAME = "Content-Disposition";
+    public final static String NAME = "content-disposition";
 
     /**
      * Session Disposition Type Constant
      */
-    public final static String SESSION = "Session";    
+    public final static String SESSION = "session";    
 
     /**
      * Render Disposition Type Constant
      */
-    public final static String RENDER = "Render";    
+    public final static String RENDER = "render";    
     
     /**
      * Icon Disposition Type Constant
      */
-    public final static String ICON = "Icon";    
+    public final static String ICON = "icon";    
     
     /**
      * Alert Disposition Type Constant
      */
-    public final static String ALERT = "Alert";        
+    public final static String ALERT = "alert";        
     
 }
 
Index: src/javax/sip/header/AuthorizationHeader.java
===================================================================
--- src/javax/sip/header/AuthorizationHeader.java	(revision 9128)
+++ src/javax/sip/header/AuthorizationHeader.java	(working copy)
@@ -285,7 +285,7 @@
     /**
      * Name of AuthorizationHeader
      */
-    public final static String NAME = "Authorization";
+    public final static String NAME = "authorization";
 
 }
 
Index: src/javax/sip/header/AllowEventsHeader.java
===================================================================
--- src/javax/sip/header/AllowEventsHeader.java	(revision 9128)
+++ src/javax/sip/header/AllowEventsHeader.java	(working copy)
@@ -77,7 +77,7 @@
     /**
      * Name of AllowEventsHeader
      */
-    public final static String NAME = "Allow-Events";
+    public final static String NAME = "allow-events";
 
 }
 
Index: src/javax/sip/header/ErrorInfoHeader.java
===================================================================
--- src/javax/sip/header/ErrorInfoHeader.java	(revision 9128)
+++ src/javax/sip/header/ErrorInfoHeader.java	(working copy)
@@ -158,7 +158,7 @@
 
      */
 
-    public final static String NAME = "Error-Info";
+    public final static String NAME = "error-info";
 
 }
 
Index: src/javax/sip/header/ExpiresHeader.java
===================================================================
--- src/javax/sip/header/ExpiresHeader.java	(revision 9128)
+++ src/javax/sip/header/ExpiresHeader.java	(working copy)
@@ -125,7 +125,7 @@
     /**
      * Name of ExpiresHeader
      */
-    public final static String NAME = "Expires";
+    public final static String NAME = "expires";
 
 
 
Index: src/javax/sip/header/RAckHeader.java
===================================================================
--- src/javax/sip/header/RAckHeader.java	(revision 9128)
+++ src/javax/sip/header/RAckHeader.java	(working copy)
@@ -116,7 +116,7 @@
     /**
      * Name of RAckHeader.
      */
-    public final static String NAME = "RAck";
+    public final static String NAME = "rack";
 
 }
 
Index: src/javax/sip/header/ContentEncodingHeader.java
===================================================================
--- src/javax/sip/header/ContentEncodingHeader.java	(revision 9128)
+++ src/javax/sip/header/ContentEncodingHeader.java	(working copy)
@@ -62,7 +62,7 @@
     /**
      * Name of ContentEncodingHeader
      */
-    public final static String NAME = "Content-Encoding";
+    public final static String NAME = "content-encoding";
 
 }
 
Index: src/javax/sip/header/MinExpiresHeader.java
===================================================================
--- src/javax/sip/header/MinExpiresHeader.java	(revision 9128)
+++ src/javax/sip/header/MinExpiresHeader.java	(working copy)
@@ -97,7 +97,7 @@
 
      */
 
-    public final static String NAME = "Min-Expires";
+    public final static String NAME = "min-expires";
 
 
 
Index: src/javax/sip/header/AlertInfoHeader.java
===================================================================
--- src/javax/sip/header/AlertInfoHeader.java	(revision 9128)
+++ src/javax/sip/header/AlertInfoHeader.java	(working copy)
@@ -72,7 +72,7 @@
     /**
      * Name of the AlertInfoHeader
      */
-    public final static String NAME = "Alert-Info";
+    public final static String NAME = "alert-info";
 
 }
 
Index: src/javax/sip/header/SubscriptionStateHeader.java
===================================================================
--- src/javax/sip/header/SubscriptionStateHeader.java	(revision 9128)
+++ src/javax/sip/header/SubscriptionStateHeader.java	(working copy)
@@ -138,14 +138,14 @@
     /**
      * Name of SubscriptionStateHeader
      */
-    public final static String NAME = "Subscription-State";
+    public final static String NAME = "subscription-state";
 
 //Reason Code Constants    
     
     /**
      * Reason Code: The reason why the subscription was terminated is Unknown.
      */
-    public final static String UNKNOWN = "Unknown";
+    public final static String UNKNOWN = "unknown";
     
     /**
      * Reason Code: The subscription has been terminated, but the subscriber SHOULD retry 
@@ -153,7 +153,7 @@
      * code is to allow migration of subscriptions between nodes. The 
      * "retry-after" parameter has no semantics for "deactivated".
      */
-    public final static String DEACTIVATED = "Deactivated";
+    public final static String DEACTIVATED = "deactivated";
     
     /**
      * Reason Code: The subscription has been terminated, but the client SHOULD retry at 
@@ -161,21 +161,21 @@
      * SHOULD wait at least the number of seconds specified by that parameter 
      * before attempting to re-subscribe.
      */
-    public final static String PROBATION = "Probation";
+    public final static String PROBATION = "probation";
     
     /**
      * Reason Code: The subscription has been terminated due to change in authorization 
      * policy. Clients SHOULD NOT attempt to re-subscribe. The "retry-after" 
      * parameter has no semantics for "rejected".
      */
-    public final static String REJECTED = "Rejected";
+    public final static String REJECTED = "rejected";
     
     /**
      * Reason Code: The subscription has been terminated because it was not refreshed before 
      * it expired. Clients MAY re-subscribe immediately. The "retry-after" 
      * parameter has no semantics for "timeout".
      */
-    public final static String TIMEOUT = "Timeout";
+    public final static String TIMEOUT = "timeout";
     
     /**
      * Reason Code: The subscription has been terminated because the notifier could not 
@@ -185,14 +185,14 @@
      * the client MAY retry immediately, but will likely get put back into 
      * pending state.
      */
-    public final static String GIVE_UP = "Give-Up";
+    public final static String GIVE_UP = "give-up";
     
     /**
      * Reason Code: The subscription has been terminated because the resource state which was 
      * being monitored no longer exists. Clients SHOULD NOT attempt to 
      * re-subscribe. The "retry-after" parameter has no semantics for "noresource".
      */
-    public final static String NO_RESOURCE = "No-Resource";
+    public final static String NO_RESOURCE = "no-resource";
  
 // State constants    
     
@@ -200,19 +200,19 @@
      * State: The subscription has been accepted and (in general) has been 
      * authorized.
      */
-    public final static String ACTIVE = "Active";
+    public final static String ACTIVE = "active";
     
     /**
      * State: The subscription has been terminated, if a reason code is present, 
      * the client should behave as described in the reason code.
      */
-    public final static String TERMINATED = "Terminated";
+    public final static String TERMINATED = "terminated";
     
     /**
      * State: The subscription has been received by the notifier, but there is 
      * insufficient policy information to grant or deny the subscription yet.
      */
-    public final static String PENDING = "Pending";
+    public final static String PENDING = "pending";
     
 }
 
Index: src/javax/sip/header/ReasonHeader.java
===================================================================
--- src/javax/sip/header/ReasonHeader.java	(revision 9128)
+++ src/javax/sip/header/ReasonHeader.java	(working copy)
@@ -130,7 +130,7 @@
     /**
      * Name of ReasonHeader
      */
-    public final static String NAME = "Reason";
+    public final static String NAME = "reason";
 
 }
 
Index: src/javax/sip/header/MaxForwardsHeader.java
===================================================================
--- src/javax/sip/header/MaxForwardsHeader.java	(revision 9128)
+++ src/javax/sip/header/MaxForwardsHeader.java	(working copy)
@@ -140,7 +140,7 @@
 
      */
 
-    public final static String NAME = "Max-Forwards";
+    public final static String NAME = "max-forwards";
 
 }
 
Index: src/javax/sip/header/ProxyAuthorizationHeader.java
===================================================================
--- src/javax/sip/header/ProxyAuthorizationHeader.java	(revision 9128)
+++ src/javax/sip/header/ProxyAuthorizationHeader.java	(working copy)
@@ -119,7 +119,7 @@
 
      */
 
-    public final static String NAME = "Proxy-Authorization";
+    public final static String NAME = "proxy-authorization";
 
 }
 
Index: src/javax/sip/header/TimeStampHeader.java
===================================================================
--- src/javax/sip/header/TimeStampHeader.java	(revision 9128)
+++ src/javax/sip/header/TimeStampHeader.java	(working copy)
@@ -93,7 +93,7 @@
     /**
      * Name of TimeStampHeader
      */
-    public final static String NAME = "Timestamp";
+    public final static String NAME = "timestamp";
 
 }
 
Index: src/javax/sip/header/FromHeader.java
===================================================================
--- src/javax/sip/header/FromHeader.java	(revision 9128)
+++ src/javax/sip/header/FromHeader.java	(working copy)
@@ -186,7 +186,7 @@
 
      */
 
-    public final static String NAME = "From";
+    public final static String NAME = "from";
 
 }
 
Index: src/javax/sip/header/OrganizationHeader.java
===================================================================
--- src/javax/sip/header/OrganizationHeader.java	(revision 9128)
+++ src/javax/sip/header/OrganizationHeader.java	(working copy)
@@ -97,7 +97,7 @@
 
      */
 
-    public final static String NAME = "Organization";
+    public final static String NAME = "organization";
 
 
 
Index: src/javax/sip/header/WarningHeader.java
===================================================================
--- src/javax/sip/header/WarningHeader.java	(revision 9128)
+++ src/javax/sip/header/WarningHeader.java	(working copy)
@@ -143,7 +143,7 @@
     /**
      * Name of WarningHeader
      */
-    public final static String NAME = "Warning";
+    public final static String NAME = "warning";
 
 // Constants
 
Index: src/javax/sip/header/RSeqHeader.java
===================================================================
--- src/javax/sip/header/RSeqHeader.java	(revision 9128)
+++ src/javax/sip/header/RSeqHeader.java	(working copy)
@@ -74,7 +74,7 @@
     /**
      * Name of RSeqHeader
      */
-    public final static String NAME = "RSeq";
+    public final static String NAME = "rseq";
 
 }
 
Index: src/javax/sip/header/RequireHeader.java
===================================================================
--- src/javax/sip/header/RequireHeader.java	(revision 9128)
+++ src/javax/sip/header/RequireHeader.java	(working copy)
@@ -97,7 +97,7 @@
 
      */
 
-    public final static String NAME = "Require";
+    public final static String NAME = "require";
 
 }
 
Index: src/javax/sip/header/ContentTypeHeader.java
===================================================================
--- src/javax/sip/header/ContentTypeHeader.java	(revision 9128)
+++ src/javax/sip/header/ContentTypeHeader.java	(working copy)
@@ -51,7 +51,7 @@
     /**
      * Name of ContentTypeHeader
      */
-    public final static String NAME = "Content-Type";
+    public final static String NAME = "content-type";
 
 }
 
Index: src/javax/sip/header/ContentLanguageHeader.java
===================================================================
--- src/javax/sip/header/ContentLanguageHeader.java	(revision 9128)
+++ src/javax/sip/header/ContentLanguageHeader.java	(working copy)
@@ -65,7 +65,7 @@
     /**
      * Name of ContentLanguageHeader
      */
-    public final static String NAME = "Content-Language";
+    public final static String NAME = "content-language";
 
 }
 
Index: src/javax/sip/header/ViaHeader.java
===================================================================
--- src/javax/sip/header/ViaHeader.java	(revision 9128)
+++ src/javax/sip/header/ViaHeader.java	(working copy)
@@ -297,7 +297,7 @@
     /**
      * Name of ViaHeader
      */
-    public final static String NAME = "Via";
+    public final static String NAME = "via";
 
 }
 
Index: src/javax/sip/header/ProxyAuthenticateHeader.java
===================================================================
--- src/javax/sip/header/ProxyAuthenticateHeader.java	(revision 9128)
+++ src/javax/sip/header/ProxyAuthenticateHeader.java	(working copy)
@@ -76,7 +76,7 @@
     /**
      * Name of ProxyAuthenticateHeader
      */
-    public final static String NAME = "Proxy-Authenticate";
+    public final static String NAME = "proxy-authenticate";
 
 }
 
Index: src/javax/sip/header/PriorityHeader.java
===================================================================
--- src/javax/sip/header/PriorityHeader.java	(revision 9128)
+++ src/javax/sip/header/PriorityHeader.java	(working copy)
@@ -179,7 +179,7 @@
 
      */
 
-    public final static String NAME = "Priority";
+    public final static String NAME = "priority";
 
 
 
Index: src/javax/sip/header/SupportedHeader.java
===================================================================
--- src/javax/sip/header/SupportedHeader.java	(revision 9128)
+++ src/javax/sip/header/SupportedHeader.java	(working copy)
@@ -71,7 +71,7 @@
 
      */
 
-    public final static String NAME = "Supported";
+    public final static String NAME = "supported";
 
 }
 
Index: src/javax/sip/header/RetryAfterHeader.java
===================================================================
--- src/javax/sip/header/RetryAfterHeader.java	(revision 9128)
+++ src/javax/sip/header/RetryAfterHeader.java	(working copy)
@@ -212,7 +212,7 @@
 
      */
 
-    public final static String NAME = "Retry-After";
+    public final static String NAME = "retry-after";
 
     
 
Index: src/javax/sip/header/UnsupportedHeader.java
===================================================================
--- src/javax/sip/header/UnsupportedHeader.java	(revision 9128)
+++ src/javax/sip/header/UnsupportedHeader.java	(working copy)
@@ -44,7 +44,7 @@
     /**
      * Name of UnsupportedHeader
      */
-    public final static String NAME = "Unsupported";
+    public final static String NAME = "unsupported";
 
 }
 
Index: src/javax/sip/header/MimeVersionHeader.java
===================================================================
--- src/javax/sip/header/MimeVersionHeader.java	(revision 9128)
+++ src/javax/sip/header/MimeVersionHeader.java	(working copy)
@@ -81,7 +81,7 @@
     /**
      * Name of MimeVersionHeader
      */
-    public final static String NAME = "MIME-Version";
+    public final static String NAME = "mime-version";
 
 }
 
Index: src/javax/sip/header/RecordRouteHeader.java
===================================================================
--- src/javax/sip/header/RecordRouteHeader.java	(revision 9128)
+++ src/javax/sip/header/RecordRouteHeader.java	(working copy)
@@ -67,6 +67,6 @@
     /**
      * Name of RecordRouteHeader
      */
-    public final static String NAME = "Record-Route";
+    public final static String NAME = "record-route";
 }
 
Index: src/javax/sip/header/ReplyToHeader.java
===================================================================
--- src/javax/sip/header/ReplyToHeader.java	(revision 9128)
+++ src/javax/sip/header/ReplyToHeader.java	(working copy)
@@ -75,7 +75,7 @@
 
      */
 
-    public final static String NAME = "Reply-To";
+    public final static String NAME = "reply-to";
 
 }
 
Index: src/javax/sip/header/AcceptHeader.java
===================================================================
--- src/javax/sip/header/AcceptHeader.java	(revision 9128)
+++ src/javax/sip/header/AcceptHeader.java	(working copy)
@@ -158,7 +158,7 @@
 
      */
 
-    public final static String NAME = "Accept";
+    public final static String NAME = "accept";
 
 
 
Index: src/javax/sip/header/ServerHeader.java
===================================================================
--- src/javax/sip/header/ServerHeader.java	(revision 9128)
+++ src/javax/sip/header/ServerHeader.java	(working copy)
@@ -70,7 +70,7 @@
     /**
      * Name of ServerHeader
      */
-    public final static String NAME = "Server";
+    public final static String NAME = "server";
 
 }
 
Index: src/javax/sip/header/ReferToHeader.java
===================================================================
--- src/javax/sip/header/ReferToHeader.java	(revision 9128)
+++ src/javax/sip/header/ReferToHeader.java	(working copy)
@@ -46,7 +46,7 @@
     /**
      * Name of ReferToHeader
      */
-    public final static String NAME = "Refer-To";
+    public final static String NAME = "refer-to";
 
 }
 
Index: src/javax/sip/header/AcceptEncodingHeader.java
===================================================================
--- src/javax/sip/header/AcceptEncodingHeader.java	(revision 9128)
+++ src/javax/sip/header/AcceptEncodingHeader.java	(working copy)
@@ -79,7 +79,7 @@
     /**
      * Name of AcceptEncodingHeader
      */
-    public final static String NAME = "Accept-Encoding";
+    public final static String NAME = "accept-encoding";
 
 }
 
Index: src/javax/sip/header/ProxyRequireHeader.java
===================================================================
--- src/javax/sip/header/ProxyRequireHeader.java	(revision 9128)
+++ src/javax/sip/header/ProxyRequireHeader.java	(working copy)
@@ -73,7 +73,7 @@
 
      */
 
-    public final static String NAME = "Proxy-Require";
+    public final static String NAME = "proxy-require";
 
 }
 
Index: src/javax/sip/header/ToHeader.java
===================================================================
--- src/javax/sip/header/ToHeader.java	(revision 9128)
+++ src/javax/sip/header/ToHeader.java	(working copy)
@@ -134,6 +134,6 @@
     /**
      * Name of the ToHeader
      */
-    public final static String NAME = "To";
+    public final static String NAME = "to";
 }
 
Index: src/javax/sip/header/WWWAuthenticateHeader.java
===================================================================
--- src/javax/sip/header/WWWAuthenticateHeader.java	(revision 9128)
+++ src/javax/sip/header/WWWAuthenticateHeader.java	(working copy)
@@ -239,6 +239,6 @@
     /**
      * Name of WWWAuthenticateHeader
      */
-    public final static String NAME = "WWW-Authenticate";
+    public final static String NAME = "www-authenticate";
 }
 
Index: src/javax/sip/header/InReplyToHeader.java
===================================================================
--- src/javax/sip/header/InReplyToHeader.java	(revision 9128)
+++ src/javax/sip/header/InReplyToHeader.java	(working copy)
@@ -68,7 +68,7 @@
     /**
      * Name of InReplyToHeader
      */
-    public final static String NAME = "In-Reply-To";
+    public final static String NAME = "in-reply-to";
 
 }
 
Index: src/javax/sip/header/AuthenticationInfoHeader.java
===================================================================
--- src/javax/sip/header/AuthenticationInfoHeader.java	(revision 9128)
+++ src/javax/sip/header/AuthenticationInfoHeader.java	(working copy)
@@ -145,7 +145,7 @@
     /**
      * Name of the AlertInfoHeader
      */
-    public final static String NAME = "Authentication-Info";
+    public final static String NAME = "authentication-info";
 
 }
 
Index: src/javax/sip/header/CSeqHeader.java
===================================================================
--- src/javax/sip/header/CSeqHeader.java	(revision 9128)
+++ src/javax/sip/header/CSeqHeader.java	(working copy)
@@ -116,7 +116,7 @@
      /**
      * Name of the CSeqHeader
      */
-    public final static String NAME = "CSeq";
+    public final static String NAME = "cseq";
 
 }
 
Index: src/javax/sip/header/AcceptLanguageHeader.java
===================================================================
--- src/javax/sip/header/AcceptLanguageHeader.java	(revision 9128)
+++ src/javax/sip/header/AcceptLanguageHeader.java	(working copy)
@@ -156,7 +156,7 @@
 
      */
 
-    public final static String NAME = "Accept-Language";
+    public final static String NAME = "accept-language";
 
 
 
Index: src/javax/sip/header/ContentLengthHeader.java
===================================================================
--- src/javax/sip/header/ContentLengthHeader.java	(revision 9128)
+++ src/javax/sip/header/ContentLengthHeader.java	(working copy)
@@ -119,7 +119,7 @@
 
      */
 
-    public final static String NAME = "Content-Length";
+    public final static String NAME = "content-length";
 
 }
 
Index: src/javax/sip/header/DateHeader.java
===================================================================
--- src/javax/sip/header/DateHeader.java	(revision 9128)
+++ src/javax/sip/header/DateHeader.java	(working copy)
@@ -91,7 +91,7 @@
 
      */
 
-    public final static String NAME = "Date";
+    public final static String NAME = "date";
 
 
 
Index: src/javax/sip/header/AllowHeader.java
===================================================================
--- src/javax/sip/header/AllowHeader.java	(revision 9128)
+++ src/javax/sip/header/AllowHeader.java	(working copy)
@@ -72,7 +72,7 @@
     /**
      * Name of AllowHeader
      */
-    public final static String NAME = "Allow";
+    public final static String NAME = "allow";
 
 }
 
Index: src/javax/sip/header/EventHeader.java
===================================================================
--- src/javax/sip/header/EventHeader.java	(revision 9128)
+++ src/javax/sip/header/EventHeader.java	(working copy)
@@ -113,7 +113,7 @@
     /**
      * Name of EventHeader
      */
-    public final static String NAME = "Event";
+    public final static String NAME = "event";
 
 }
 
Index: src/gov/nist/javax/sip/message/SIPMessage.java
===================================================================
--- src/gov/nist/javax/sip/message/SIPMessage.java	(revision 9128)
+++ src/gov/nist/javax/sip/message/SIPMessage.java	(working copy)
@@ -695,7 +695,7 @@
 			return;
 		}
 
-		SIPHeader originalHeader = (SIPHeader) getHeader(header.getName());
+		SIPHeader originalHeader = (SIPHeader) getHeader(header.getName().toLowerCase());
 
 		// Delete the original header from our list structure.
 		if (originalHeader != null) {
@@ -709,14 +709,15 @@
 			}
 		}
 
-		if (getHeader(header.getName()) == null) {
-			nameTable.put(header.getName().toLowerCase(), h);
+      String nameLowCase = new String(header.getName().toLowerCase());
+		if (getHeader(nameLowCase) == null) {
+			nameTable.put(nameLowCase, h);
 			headers.add(h);
 		} else {
 			if (h instanceof SIPHeaderList) {
 				SIPHeaderList hdrlist =
 					(SIPHeaderList) nameTable.get(
-						header.getName().toLowerCase());
+						nameLowCase);
 				if (hdrlist != null)
 					hdrlist.concatenate((SIPHeaderList) h, top);
 				else
@@ -940,7 +941,7 @@
 		if (headerName == null)
 			throw new NullPointerException("bad name");
 		SIPHeader sipHeader =
-			(SIPHeader) this.nameTable.get(headerName.toLowerCase());
+			(SIPHeader) this.nameTable.get(headerName);
 		if (sipHeader instanceof SIPHeaderList)
 			return (Header) ((SIPHeaderList) sipHeader).getFirst();
 		else
@@ -1384,7 +1385,7 @@
 		if (headerName == null)
 			throw new NullPointerException("null headerName");
 		SIPHeader sipHeader =
-			(SIPHeader) nameTable.get(headerName.toLowerCase());
+			(SIPHeader) nameTable.get(headerName);
 		// empty iterator
 		if (sipHeader == null)
 			return new LinkedList().listIterator();
@@ -1401,7 +1402,7 @@
 
 	private LinkedList getHeaderList(String headerName) {
 		SIPHeader sipHeader =
-			(SIPHeader) nameTable.get(headerName.toLowerCase());
+			(SIPHeader) nameTable.get(headerName);
 		if (sipHeader == null)
 			return null;
 		else if (sipHeader instanceof SIPHeaderList)
Index: src/gov/nist/javax/sip/header/NameMap.java
===================================================================
--- src/gov/nist/javax/sip/header/NameMap.java	(revision 9128)
+++ src/gov/nist/javax/sip/header/NameMap.java	(working copy)
@@ -48,97 +48,97 @@
 
 	private static void initializeNameMap() {
 		nameMap = new Hashtable();
-		putNameMap(MIN_EXPIRES, "MinExpires"); // 1
+		putNameMap(MIN_EXPIRES, "minexpires"); // 1
 
-		putNameMap(ERROR_INFO, "ErrorInfo"); // 2
+		putNameMap(ERROR_INFO, "errorinfo"); // 2
 
-		putNameMap(MIME_VERSION, "MimeVersion"); // 3
+		putNameMap(MIME_VERSION, "mimeversion"); // 3
 
-		putNameMap(IN_REPLY_TO, "InReplyTo"); // 4
+		putNameMap(IN_REPLY_TO, "inreplyto"); // 4
 
-		putNameMap(ALLOW, "Allow"); // 5
+		putNameMap(ALLOW, "allow"); // 5
 
-		putNameMap(CONTENT_LANGUAGE, "ContentLanguage"); // 6
+		putNameMap(CONTENT_LANGUAGE, "contentlanguage"); // 6
 
-		putNameMap(CALL_INFO, "CallInfo"); //7
+		putNameMap(CALL_INFO, "callinfo"); //7
 
-		putNameMap(CSEQ, "CSeq"); //8
+		putNameMap(CSEQ, "cseq"); //8
 
-		putNameMap(ALERT_INFO, "AlertInfo"); //9
+		putNameMap(ALERT_INFO, "alertinfo"); //9
 
-		putNameMap(ACCEPT_ENCODING, "AcceptEncoding"); //10
+		putNameMap(ACCEPT_ENCODING, "acceptencoding"); //10
 
-		putNameMap(ACCEPT, "Accept"); //11
+		putNameMap(ACCEPT, "accept"); //11
 
-		putNameMap(ACCEPT_LANGUAGE, "AcceptLanguage"); //12
+		putNameMap(ACCEPT_LANGUAGE, "acceptlanguage"); //12
 
-		putNameMap(RECORD_ROUTE, "RecordRoute"); //13
+		putNameMap(RECORD_ROUTE, "recordroute"); //13
 
-		putNameMap(TIMESTAMP, "TimeStamp"); //14
+		putNameMap(TIMESTAMP, "timestamp"); //14
 
-		putNameMap(TO, "To"); //15
+		putNameMap(TO, "to"); //15
 
-		putNameMap(VIA, "Via"); //16
+		putNameMap(VIA, "via"); //16
 
-		putNameMap(FROM, "From"); //17
+		putNameMap(FROM, "from"); //17
 
-		putNameMap(CALL_ID, "CallID"); //18
+		putNameMap(CALL_ID, "callid"); //18
 
-		putNameMap(AUTHORIZATION, "Authorization"); //19
+		putNameMap(AUTHORIZATION, "authorization"); //19
 
-		putNameMap(PROXY_AUTHENTICATE, "ProxyAuthenticate"); //20
+		putNameMap(PROXY_AUTHENTICATE, "proxyauthenticate"); //20
 
-		putNameMap(SERVER, "Server"); //21
+		putNameMap(SERVER, "server"); //21
 
-		putNameMap(UNSUPPORTED, "Unsupported"); //22
+		putNameMap(UNSUPPORTED, "unsupported"); //22
 
-		putNameMap(RETRY_AFTER, "RetryAfter"); //23
+		putNameMap(RETRY_AFTER, "retryafter"); //23
 
-		putNameMap(CONTENT_TYPE, "ContentType"); //24
+		putNameMap(CONTENT_TYPE, "contenttype"); //24
 
-		putNameMap(CONTENT_ENCODING, "ContentEncoding"); //25
+		putNameMap(CONTENT_ENCODING, "contentencoding"); //25
 
-		putNameMap(CONTENT_LENGTH, "ContentLength"); //26
+		putNameMap(CONTENT_LENGTH, "contentlength"); //26
 
-		putNameMap(ROUTE, "Route"); //27
+		putNameMap(ROUTE, "route"); //27
 
-		putNameMap(CONTACT, "Contact"); //28
+		putNameMap(CONTACT, "contact"); //28
 
-		putNameMap(WWW_AUTHENTICATE, "WWWAuthenticate"); //29
+		putNameMap(WWW_AUTHENTICATE, "wwwauthenticate"); //29
 
-		putNameMap(MAX_FORWARDS, "MaxForwards"); //30
+		putNameMap(MAX_FORWARDS, "maxforwards"); //30
 
-		putNameMap(ORGANIZATION, "Organization"); //31
+		putNameMap(ORGANIZATION, "organization"); //31
 
-		putNameMap(PROXY_AUTHORIZATION, "ProxyAuthorization"); //32
+		putNameMap(PROXY_AUTHORIZATION, "proxyauthorization"); //32
 
-		putNameMap(PROXY_REQUIRE, "ProxyRequire"); //33
+		putNameMap(PROXY_REQUIRE, "proxyrequire"); //33
 
-		putNameMap(REQUIRE, "Require"); //34
+		putNameMap(REQUIRE, "require"); //34
 
-		putNameMap(CONTENT_DISPOSITION, "ContentDisposition"); //35
+		putNameMap(CONTENT_DISPOSITION, "contentdisposition"); //35
 
-		putNameMap(SUBJECT, "Subject"); //36
+		putNameMap(SUBJECT, "subject"); //36
 
-		putNameMap(USER_AGENT, "UserAgent"); //37
+		putNameMap(USER_AGENT, "useragent"); //37
 
-		putNameMap(WARNING, "Warning"); //38
+		putNameMap(WARNING, "warning"); //38
 
-		putNameMap(PRIORITY, "Priority"); //39
+		putNameMap(PRIORITY, "priority"); //39
 
-		putNameMap(DATE, "SIPDateHeader"); //40
+		putNameMap(DATE, "sipdateheader"); //40
 
-		putNameMap(EXPIRES, "Expires"); //41
+		putNameMap(EXPIRES, "expires"); //41
 
-		putNameMap(SUPPORTED, "Supported"); //42
+		putNameMap(SUPPORTED, "supported"); //42
 
-		putNameMap(REPLY_TO, "ReplyTo"); // 43
+		putNameMap(REPLY_TO, "replyto"); // 43
 
-		putNameMap(SUBSCRIPTION_STATE, "SubscriptionState"); //44
+		putNameMap(SUBSCRIPTION_STATE, "subscriptionstate"); //44
 
-		putNameMap(EVENT, "Event"); //45
+		putNameMap(EVENT, "event"); //45
 
-		putNameMap(ALLOW_EVENTS, "AllowEvents"); //46
+		putNameMap(ALLOW_EVENTS, "allowevents"); //46
 	}
 }