From c496c3930c48edf6482279f09798921f12dd8267 Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Thu, 23 Oct 2014 22:05:40 -0400
Subject: [PATCH] Get rid of the namespace prefix in templates and includes.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 templates/includes/AcceptItemResponse.inc        |  20 ++---
 templates/includes/CancelRequestItemResponse.inc |  20 ++---
 templates/includes/CheckInItemResponse.inc       |  20 ++---
 templates/includes/CheckOutItemResponse.inc      |   2 +-
 templates/includes/ItemOptionalFields.inc        |  80 +++++++++---------
 templates/includes/LookupUserResponse.inc        |  16 ++--
 templates/includes/LookupVersionResponse.inc     |  20 ++---
 templates/includes/RenewItemResponse.inc         |   2 +-
 templates/includes/RequestItemResponse.inc       |  24 +++---
 templates/includes/ResponseHeader.inc            |  20 ++---
 templates/includes/UserOptionalFields.inc        | 102 +++++++++++------------
 templates/includes/footer.inc                    |   2 +-
 templates/includes/header.inc                    |   2 +-
 templates/includes/problem.inc                   |  22 ++---
 templates/response.tt                            |   4 +-
 15 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/templates/includes/AcceptItemResponse.inc b/templates/includes/AcceptItemResponse.inc
index 89b38d5..5f91712 100644
--- a/templates/includes/AcceptItemResponse.inc
+++ b/templates/includes/AcceptItemResponse.inc
@@ -1,21 +1,21 @@
-<ncip:RequestId>
+<RequestId>
 [% IF data.RequestId.AgencyId -%]
-<ncip:AgencyId>[% data.RequestId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
 [% END -%]
 [% IF data.RequestId.RequestIdentifierType -%]
-<ncip:RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</ncip:RequestIdentifierType>
+<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
 [% END -%]
-<ncip:RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</ncip:RequestIdentifierValue>
-</ncip:RequestId>
+<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
+</RequestId>
 [% IF data.ItemId -%]
-<ncip:ItemId>
+<ItemId>
 [% IF data.ItemId.AgencyId -%]
-<ncip:AgencyId>[% data.ItemId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.ItemId.AgencyId | xml %]</AgencyId>
 [% END -%]
 [% IF data.ItemId.ItemIdentifierType -%]
-<ncip:ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ncip:ItemIdentifierType>
+<ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ItemIdentifierType>
 [% END -%]
-<ncip:ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ncip:ItemIdentifierValue>
-</ncip:ItemId>
+<ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ItemIdentifierValue>
+</ItemId>
 [% END -%]
 [% INCLUDE "includes/UserOptionalFields.inc" -%]
diff --git a/templates/includes/CancelRequestItemResponse.inc b/templates/includes/CancelRequestItemResponse.inc
index a14c22f..ea3aa3d 100644
--- a/templates/includes/CancelRequestItemResponse.inc
+++ b/templates/includes/CancelRequestItemResponse.inc
@@ -1,20 +1,20 @@
-<ncip:RequestId>
+<RequestId>
 [% IF data.RequestId.AgencyId -%]
-<ncip:AgencyId>[% data.RequestId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<ncip:RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</ncip:RequestIdentifierValue>
+<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
 [% IF data.RequestId.RequestIdentifierType -%]
-<ncip:RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</ncip:RequestIdentifierType>
+<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
 [% END %]
-</ncip:RequestId>
-<ncip:UserId>
+</RequestId>
+<UserId>
 [% IF data.UserId.AgencyId -%]
-<ncip:AgencyId>[% data.UserId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<ncip:UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</ncip:UserIdentifierValue>
+<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
 [% IF data.UserId.UserIdentifierType -%]
-<ncip:UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</ncip:UserIdentiferiType>
+<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
 [% END -%]
-</ncip:UserId>
+</UserId>
 [% INCLUDE "includes/UserOptionalFields.inc" -%]
 [% INCLUDE "includes/ItemOptionalFields.inc" -%]
diff --git a/templates/includes/CheckInItemResponse.inc b/templates/includes/CheckInItemResponse.inc
index 5a21760..29943b0 100644
--- a/templates/includes/CheckInItemResponse.inc
+++ b/templates/includes/CheckInItemResponse.inc
@@ -1,22 +1,22 @@
-<ncip:ItemId>
+<ItemId>
 [% IF data.ItemId.AgencyId -%]
-<ncip:AgencyId>[% data.ItemId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.ItemId.AgencyId | xml %]</AgencyId>
 [% END -%]
 [% IF data.ItemId.ItemIdentifierType -%]
-<ncip:ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ncip:ItemIdentifierType>
+<ItemIdentifierType>[% data.ItemId.ItemIdentifierType | xml %]</ItemIdentifierType>
 [% END -%]
-<ncip:ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ncip:ItemIdentifierValue>
-</ncip:ItemId>
+<ItemIdentifierValue>[% data.ItemId.ItemIdentifierValue | xml %]</ItemIdentifierValue>
+</ItemId>
 [% IF data.UserId -%]
-<ncip:UserId>
+<UserId>
 [% IF data.UserId.AgencyId -%]
-<ncip:AgencyId>[% data.UserId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
 [% END -%]
 [% IF data.UserId.UserIdentifierType -%]
-<ncip:UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</ncip:UserIdentifierType>
+<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentifierType>
 [% END -%]
-<ncip:UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</ncip:UserIdentifierValue>
-</ncip:UserId>
+<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
+</UserId>
 [% END -%]
 [% INCLUDE "includes/UserOptionalFields.inc" -%]
 [% INCLUDE "includes/ItemOptionalFields.inc" -%]
diff --git a/templates/includes/CheckOutItemResponse.inc b/templates/includes/CheckOutItemResponse.inc
index dd82830..661a94b 100644
--- a/templates/includes/CheckOutItemResponse.inc
+++ b/templates/includes/CheckOutItemResponse.inc
@@ -1,4 +1,4 @@
 [% INCLUDE "includes/CheckInItemResponse.inc" %]
 [% IF data.DateDue -%]
-<ncip:DateDue>[% data.DateDue | xml %]</ncip:DateDue>
+<DateDue>[% data.DateDue | xml %]</DateDue>
 [% END -%]
diff --git a/templates/includes/ItemOptionalFields.inc b/templates/includes/ItemOptionalFields.inc
index 1efc4e9..35928f9 100644
--- a/templates/includes/ItemOptionalFields.inc
+++ b/templates/includes/ItemOptionalFields.inc
@@ -1,91 +1,91 @@
 [% IF data.ItemOptionalFields -%]
-<ncip:ItemOptionalFields>
+<ItemOptionalFields>
 [% IF data.ItemOptionalFields.BibliographicDescription -%]
-<ncip:BibliographicDescription>
+<BibliographicDescription>
 [% IF data.ItemOptionalFields.BibliographicDescription.Author -%]
-<ncip:Author>
+<Author>
 [% data.ItemOptionalFields.BibliographicDescription.Author | xml %]
-</ncip:Author>
+</Author>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.Title -%]
-<ncip:Title>
+<Title>
 [% data.ItemOptionalFields.BibliographicDescription.Title | xml %]
-</ncip:Title>
+</Title>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.Publisher -%]
-<ncip:Publisher>
+<Publisher>
 [% data.ItemOptionalFields.BibliographicDescription.Publisher | xml %]
-</ncip:Publisher>
+</Publisher>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.PublicationDate -%]
-<ncip:PublicationDate>
+<PublicationDate>
 [% data.ItemOptionalFields.BibliographicDescription.PublicationDate | xml %]
-</ncip:PublicationDate>
+</PublicationDate>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.Edition -%]
-<ncip:Edition>
+<Edition>
 [% data.ItemOptionalFields.BibliographicDescription.Edition | xml %]
-</ncip:Edition>
+</Edition>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId;
       id = data.ItemOptionalFields.BibliographicDescription.BibliographicRecordId -%]
-<ncip:BibliographicRecordId>
-<ncip:BibliographicRecordIdentifier>
+<BibliographicRecordId>
+<BibliographicRecordIdentifier>
 [% id.BibliographicRecordIdentifier | xml %]
-</ncip:BibliographicRecordIdentifer>
+</BibliographicRecordIdentifer>
 [% IF id.BibliographicRecordIdentifierCode -%]
-<ncip:BibliographicRecordIdentifierCode>
+<BibliographicRecordIdentifierCode>
 [% id.BibliographicRecordIdentifierCode | xml %]
-</ncip:BibliographicRecordIdentifierCode>
+</BibliographicRecordIdentifierCode>
 [% END -%]
 [% IF id.AgencyId -%]
-<ncip:AgencyId>
+<AgencyId>
 [% id.AgencyId | xml %]
-</ncip:AgencyId>
+</AgencyId>
 [% END -%]
-</ncip:BibliographicRecordId>
+</BibliographicRecordId>
 [% END -%]
 [% IF data.ItemOptionalFields.BibliographicDescription.BibliographicItemId;
       id = data.ItemOptionalFields.BibliographicDescription.BibliographicItemId -%]
-<ncip:BibliographicItemId>
-<ncip:BibliographicItemIdentifier>
+<BibliographicItemId>
+<BibliographicItemIdentifier>
 [% id.BibliographicItemIdentifier | xml %]
-</ncip:BibliographicItemIdentifier>
+</BibliographicItemIdentifier>
 [% IF id.BibliographicItemIdentifierCode -%]
-<ncip:BibliographicItemIdentifierCode>
+<BibliographicItemIdentifierCode>
 [% id.BibliographicItemIdentifierCode | xml %]
-</ncip:BibliographicItemIdentifierCode>
+</BibliographicItemIdentifierCode>
 [% END -%]
-</ncip:BibliographicItemId>
+</BibliographicItemId>
 [% END -%]
-</ncip:BibliographicDescription>
+</BibliographicDescription>
 [% END -%]
 [% IF data.ItemOptionalFields.ItemDescription -%]
-<ncip:ItemDescription>
-<ncip:CallNumber>
+<ItemDescription>
+<CallNumber>
 [% data.ItemOptionalFields.ItemDescription.CallNumber | xml %]
-</ncip:CallNumber>
-</ncip:ItemDescription>
+</CallNumber>
+</ItemDescription>
 [% END -%]
 [% IF data.ItemOptionalFields.CirculationStatus -%]
-<ncip:CirculationStatus>
+<CirculationStatus>
 [% data.ItemOptionalFields.CirculationStatus | xml %]
-</ncip:CirculationStatus>
+</CirculationStatus>
 [% END -%]
 [% IF data.ItemOptionalFields.DateDue -%]
-<ncip:DateDue>
+<DateDue>
 [% data.ItemOptionalFields.DateDue | xml %]
-</ncip:DateDue>
+</DateDue>
 [% END -%]
 [% IF data.ItemOptionalFields.ItemUseRestrictionType -%]
-<ncip:ItemUseRestrictionType>
+<ItemUseRestrictionType>
 [% data.ItemOptionalFields.ItemUseRestrictionType | xml %]
-</ncip:ItemUseRestrictionType>
+</ItemUseRestrictionType>
 [% END -%]
 [% IF data.ItemOptionalFields.PhysicalCondition -%]
-<ncip:PhysicalCondition>
+<PhysicalCondition>
 [% data.ItemOptionalFields.PhysicalCondition | xml %]
-</ncip:PhysicalCondition>
+</PhysicalCondition>
 [% END -%]
-</ncip:ItemOptionalFields>
+</ItemOptionalFields>
 [% END -%]
diff --git a/templates/includes/LookupUserResponse.inc b/templates/includes/LookupUserResponse.inc
index 3e9c07a..c2d7580 100644
--- a/templates/includes/LookupUserResponse.inc
+++ b/templates/includes/LookupUserResponse.inc
@@ -1,18 +1,18 @@
 [% FOREACH id IN data.UserId -%]
-<ncip:UserId>
+<UserId>
 [% IF id.UserIdentifierType -%]
-<ncip:UserIdentifierType>
+<UserIdentifierType>
 [% id.UserIdentifierType | xml %]
-</ncip:UserIdentifierType>
+</UserIdentifierType>
 [% END -%]
 [% IF id.AgencyId -%]
-<ncip:AgencyId>
+<AgencyId>
 [% id.AgencyId %]
-</ncip:AgencyId>
+</AgencyId>
 [% END -%]
-<ncip:UserIdentifierValue>
+<UserIdentifierValue>
 [% id.UserIdentifierValue | xml %]
-</ncip:UserIdentifierValue>
-</ncip:UserId>
+</UserIdentifierValue>
+</UserId>
 [% END -%]
 [% INCLUDE "includes/UserOptionalFields.inc" -%]
diff --git a/templates/includes/LookupVersionResponse.inc b/templates/includes/LookupVersionResponse.inc
index 8f8f4dc..f59fa05 100644
--- a/templates/includes/LookupVersionResponse.inc
+++ b/templates/includes/LookupVersionResponse.inc
@@ -1,15 +1,15 @@
-<ncip:FromAgencyId>
-<ncip:AgencyId>
+<FromAgencyId>
+<AgencyId>
 [%- data.fromagencyid -%]
-</ncip:AgencyId>
-</ncip:FromAgencyId>
-<ncip:ToAgencyId>
-<ncip:AgencyId>
+</AgencyId>
+</FromAgencyId>
+<ToAgencyId>
+<AgencyId>
 [%- data.toagencyid -%]
-</ncip:AgencyId>
-</ncip:ToAgencyId>
+</AgencyId>
+</ToAgencyId>
 [% FOREACH version IN data.versions -%]
-<ncip:VersionSupported>
+<VersionSupported>
 [%- version | xml -%]
-</ncip:VersionSupported>
+</VersionSupported>
 [% END -%]
diff --git a/templates/includes/RenewItemResponse.inc b/templates/includes/RenewItemResponse.inc
index dd82830..661a94b 100644
--- a/templates/includes/RenewItemResponse.inc
+++ b/templates/includes/RenewItemResponse.inc
@@ -1,4 +1,4 @@
 [% INCLUDE "includes/CheckInItemResponse.inc" %]
 [% IF data.DateDue -%]
-<ncip:DateDue>[% data.DateDue | xml %]</ncip:DateDue>
+<DateDue>[% data.DateDue | xml %]</DateDue>
 [% END -%]
diff --git a/templates/includes/RequestItemResponse.inc b/templates/includes/RequestItemResponse.inc
index 6032c92..1aaadb3 100644
--- a/templates/includes/RequestItemResponse.inc
+++ b/templates/includes/RequestItemResponse.inc
@@ -1,22 +1,22 @@
-<ncip:RequestId>
+<RequestId>
 [% IF data.RequestId.AgencyId -%]
-<ncip:AgencyId>[% data.RequestId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.RequestId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<ncip:RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</ncip:RequestIdentifierValue>
+<RequestIdentifierValue>[% data.RequestId.RequestIdentifierValue | xml %]</RequestIdentifierValue>
 [% IF data.RequestId.RequestIdentifierType -%]
-<ncip:RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</ncip:RequestIdentifierType>
+<RequestIdentifierType>[% data.RequestId.RequestIdentifierType | xml %]</RequestIdentifierType>
 [% END %]
-</ncip:RequestId>
-<ncip:UserId>
+</RequestId>
+<UserId>
 [% IF data.UserId.AgencyId -%]
-<ncip:AgencyId>[% data.UserId.AgencyId | xml %]</ncip:AgencyId>
+<AgencyId>[% data.UserId.AgencyId | xml %]</AgencyId>
 [% END -%]
-<ncip:UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</ncip:UserIdentifierValue>
+<UserIdentifierValue>[% data.UserId.UserIdentifierValue | xml %]</UserIdentifierValue>
 [% IF data.UserId.UserIdentifierType -%]
-<ncip:UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</ncip:UserIdentiferiType>
+<UserIdentifierType>[% data.UserId.UserIdentifierType | xml %]</UserIdentiferiType>
 [% END -%]
-</ncip:UserId>
-<ncip:RequestType>[% data.RequestType | xml %]</ncip:RequestType>
-<ncip:RequestScopeType>[% data.RequestScopeType | xml %]</ncip:RequestScopeType>
+</UserId>
+<RequestType>[% data.RequestType | xml %]</RequestType>
+<RequestScopeType>[% data.RequestScopeType | xml %]</RequestScopeType>
 [% INCLUDE "includes/UserOptionalFields.inc" -%]
 [% INCLUDE "includes/ItemOptionalFields.inc" -%]
diff --git a/templates/includes/ResponseHeader.inc b/templates/includes/ResponseHeader.inc
index 9253b2d..669d7ec 100644
--- a/templates/includes/ResponseHeader.inc
+++ b/templates/includes/ResponseHeader.inc
@@ -1,12 +1,12 @@
-<ncip:ResponseHeader>
-<ncip:FromAgencyId>
-<ncip:AgencyId>
+<ResponseHeader>
+<FromAgencyId>
+<AgencyId>
 [% header.FromAgencyId.AgencyId | xml %]
-</ncip:AgencyId>
-</ncip:FromAgencyId>
-<ncip:ToAgencyId>
-<ncip:AgencyId>
+</AgencyId>
+</FromAgencyId>
+<ToAgencyId>
+<AgencyId>
 [% header.ToAgencyId.AgencyId  | xml %]
-</ncip:AgencyId>
-</ncip:ToAgencyId>
-</ncip:ResponseHeader>
+</AgencyId>
+</ToAgencyId>
+</ResponseHeader>
diff --git a/templates/includes/UserOptionalFields.inc b/templates/includes/UserOptionalFields.inc
index 560fcfb..cf4436d 100644
--- a/templates/includes/UserOptionalFields.inc
+++ b/templates/includes/UserOptionalFields.inc
@@ -1,108 +1,108 @@
 [% IF data.UserOptionalFields -%]
-<ncip:UserOptionalFields>
+<UserOptionalFields>
 [% IF data.UserOptionalFields.NameInformation -%]
-<ncip:NameInformation>
-<ncip:PersonalNameInformation>
-<ncip:StructuredPersonalUserName>
+<NameInformation>
+<PersonalNameInformation>
+<StructuredPersonalUserName>
 [% IF data.UserOptionalFields.NameInformation.GivenName -%]
-<ncip:GivenName>[% data.UserOptionalFields.NameInformation.GivenName | xml %]</ncip:GivenName>
+<GivenName>[% data.UserOptionalFields.NameInformation.GivenName | xml %]</GivenName>
 [% END -%]
-<ncip:Surname>[% data.UserOptionalFields.NameInformation.Surname | xml %]</ncip:Surname>
+<Surname>[% data.UserOptionalFields.NameInformation.Surname | xml %]</Surname>
 [% IF data.UserOptionalFields.NameInformation.Prefix -%]
-<ncip:Prefix>[% data.UserOptionalFields.NameInformation.Prefix %]</ncip:Prefix>
+<Prefix>[% data.UserOptionalFields.NameInformation.Prefix %]</Prefix>
 [% END -%]
 [% IF data.UserOptionalFields.NameInformation.Suffix -%]
-<ncip:Suffix>[% data.UserOptionalFields.NameInformation.Suffix %]</ncip:Suffix>
+<Suffix>[% data.UserOptionalFields.NameInformation.Suffix %]</Suffix>
 [% END -%]
 [% IF data.UserOptionalFields.NameInformation.Initials -%]
-<ncip:Initials>[% data.UserOptionalFields.NameInformation.Initials %]</ncip:Initials>
+<Initials>[% data.UserOptionalFields.NameInformation.Initials %]</Initials>
 [% END -%]
-</ncip:StructuredPersonalUserName>
-</ncip:PersonalNameInformation>
-</ncip:NameInformation>
+</StructuredPersonalUserName>
+</PersonalNameInformation>
+</NameInformation>
 [% END -%]
 [% IF data.UserOptionalFields.UserAddressInformation -%]
 [% FOREACH element IN data.UserOptionalFields.UserAddressInformation -%]
-<ncip:UserAddressInformation>
-<ncip:UserAddressRoleType>[% element.UserAddressRoleType | xml %]</ncip:UserAddressRoleType>
+<UserAddressInformation>
+<UserAddressRoleType>[% element.UserAddressRoleType | xml %]</UserAddressRoleType>
 [% IF element.PhysicalAddress -%]
-<ncip:PhysicalAddress>
-<ncip:StructuredAddress>
-<ncip:Line1>[% element.PhysicalAddress.Line1 | xml %]</ncip:Line1>
+<PhysicalAddress>
+<StructuredAddress>
+<Line1>[% element.PhysicalAddress.Line1 | xml %]</Line1>
 [% IF element.PhysicalAddress.Line2 -%]
-<ncip:Line2>[% element.PhysicalAddress.Line2 | xml %]</ncip:Line2>
+<Line2>[% element.PhysicalAddress.Line2 | xml %]</Line2>
 [% END -%]
 [% IF element.PhysicalAddress.Locality -%]
-<ncip:Locality>[% element.PhysicalAddress.Locality | xml %]</ncip:Locality>
+<Locality>[% element.PhysicalAddress.Locality | xml %]</Locality>
 [% END -%]
 [% IF element.PhysicalAddress.Region -%]
-<ncip:Region>[% element.PhysicalAddress.Region | xml %]</ncip:Region>
+<Region>[% element.PhysicalAddress.Region | xml %]</Region>
 [% END -%]
 [% IF element.PhysicalAddress.Country -%]
-<ncip:Country>[% element.PhysicalAddress.Country | xml %]</ncip:Country>
+<Country>[% element.PhysicalAddress.Country | xml %]</Country>
 [% END -%]
 [% IF element.PhysicalAddress.PostalCode -%]
-<ncip:PostalCode>[% element.PhysicalAddress.PostalCode | xml %]</ncip:PostalCode>
+<PostalCode>[% element.PhysicalAddress.PostalCode | xml %]</PostalCode>
 [% END -%]
-</ncip:StructuredAddress>
-<ncip:PhysicalAddressType>Postal Address</ncip:PhysicalAddressType>
-</ncip:PhysicalAddress>
+</StructuredAddress>
+<PhysicalAddressType>Postal Address</PhysicalAddressType>
+</PhysicalAddress>
 [% ELSIF element.ElectronicAddress -%]
-<ncip:ElectronicAddress>
-<ncip:ElectronicAddressType>[% element.ElectronicAddress.Type | xml %]</ncip:ElectronicAddressType>
-<ncip:ElectronicAddressData>[% element.ElectronicAddress.Data | xml %]</ncip:ElectronicAddressData>
-</ncip:ElectronicAddress>
+<ElectronicAddress>
+<ElectronicAddressType>[% element.ElectronicAddress.Type | xml %]</ElectronicAddressType>
+<ElectronicAddressData>[% element.ElectronicAddress.Data | xml %]</ElectronicAddressData>
+</ElectronicAddress>
 [% END -%]
-</ncip:UserAddressInformation>
+</UserAddressInformation>
 [% END -%]
 [% END -%]
 [% IF data.UserOptionalFields.UserPrivilege -%]
 [% FOREACH privilege IN data.UserOptionalFields.UserPrivilege -%]
-<ncip:UserPrivilege>
-<ncip:AgencyId>[% privilege.AgencyId | xml -%]</ncip:AgencyId>
-<ncip:AgencyUserPrivilegeType>[% privilege.AgencyUserPrivilegeType | xml %]</ncip:AgencyUserPrivilegeType>
+<UserPrivilege>
+<AgencyId>[% privilege.AgencyId | xml -%]</AgencyId>
+<AgencyUserPrivilegeType>[% privilege.AgencyUserPrivilegeType | xml %]</AgencyUserPrivilegeType>
 [% IF privilege.ValidFromDate -%]
-<ncip:ValidFromDate>[% privilege.ValidFromDate | xml %]</ncip:ValidFromDate>
+<ValidFromDate>[% privilege.ValidFromDate | xml %]</ValidFromDate>
 [% END -%]
 [% IF privilege.ValidToDate -%]
-<ncip:ValidToDate>[% privilege.ValidToDate | xml %]</ncip:ValidToDate>
+<ValidToDate>[% privilege.ValidToDate | xml %]</ValidToDate>
 [% END -%]
 [% IF privilege.UserPrivilegeDescription -%]
-<ncip:UserPrivilegeDescription>[% privilege.UserPrivilegeDescription | xml %]</ncip:UserPrivilegeDescription>
+<UserPrivilegeDescription>[% privilege.UserPrivilegeDescription | xml %]</UserPrivilegeDescription>
 [% END -%]
 [% IF privilege.UserPrivilegeStatus -%]
-<ncip:UserPrivilegeStatus>
-<ncip:UserPrivilegeStatusType>
+<UserPrivilegeStatus>
+<UserPrivilegeStatusType>
 [% privilege.UserPrivilegeStatus.UserPrivilegeStatusType | xml %]
-</ncip:UserPrivilegeStatusType>
+</UserPrivilegeStatusType>
 [% IF privilege.UserPrivilegeStatus.DateOfUserPrivilegeStatus -%]
-<ncip:DateOfUserPrivilegeStatus>
+<DateOfUserPrivilegeStatus>
 [% privilege.UserPrivilegeStatus.DateOfUserPrivilegeStatus | xml %]
-</ncip:DateOfUserPrivilegeStatus>
+</DateOfUserPrivilegeStatus>
 [% END -%]
-</ncip:UserPrivilegeStatus>
+</UserPrivilegeStatus>
 [% END -%]
-</ncip:UserPrivilege>
+</UserPrivilege>
 [% END -%]
 [% END -%]
 [% IF data.UserOptionalFields.UserLanguage -%]
 [% FOREACH language IN data.UserOptionalFields.UserLanguage -%]
-<ncip:UserLanguage>[% language | xml %]</ncip:UserLanguage>
+<UserLanguage>[% language | xml %]</UserLanguage>
 [% END -%]
 [% END -%]
 [% IF data.UserOptionalFields.BlockOrTrap -%]
 [% FOREACH block IN data.UserOptionalFields.BlockOrTrap -%]
-<ncip:BlockOrTrap>
-<ncip:AgencyId>[% block.AgencyId | xml %]</ncip:AgencyId>
-<ncip:BlockOrTrapType>[% block.BlockOrTrapType | xml %]</ncip:BlockOrTrapType>
+<BlockOrTrap>
+<AgencyId>[% block.AgencyId | xml %]</AgencyId>
+<BlockOrTrapType>[% block.BlockOrTrapType | xml %]</BlockOrTrapType>
 [% IF block.ValidFromDate -%]
-<ncip:ValidFromDate>[% block.ValidFromDate %]</ncip:ValidFromDate>
+<ValidFromDate>[% block.ValidFromDate %]</ValidFromDate>
 [% END -%]
 [% IF block.ValidToDate -%]
-<ncip:ValidToDate>[% block.ValidToDate %]</ncip:ValidToDate>
+<ValidToDate>[% block.ValidToDate %]</ValidToDate>
 [% END %]
-</ncip:BlockOrTrap>
+</BlockOrTrap>
 [% END -%]
 [% END -%]
-</ncip:UserOptionalFields>
+</UserOptionalFields>
 [% END -%]
diff --git a/templates/includes/footer.inc b/templates/includes/footer.inc
index b9198da..844f1d4 100644
--- a/templates/includes/footer.inc
+++ b/templates/includes/footer.inc
@@ -1 +1 @@
-</ncip:NCIPMessage>
+</NCIPMessage>
diff --git a/templates/includes/header.inc b/templates/includes/header.inc
index 2086746..caa38cc 100644
--- a/templates/includes/header.inc
+++ b/templates/includes/header.inc
@@ -1,2 +1,2 @@
 <?xml version = '1.0' encoding='UTF-8'?>
-<ncip:NCIPMessage ncip:version='http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd' xmlns:ncip='http://www.niso.org/2008/ncip'>
+<NCIPMessage version='http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd' xmlns='http://www.niso.org/2008/ncip'>
diff --git a/templates/includes/problem.inc b/templates/includes/problem.inc
index 5d87fe3..2fd57db 100644
--- a/templates/includes/problem.inc
+++ b/templates/includes/problem.inc
@@ -1,18 +1,18 @@
-<ncip:Problem>
+<Problem>
 [% IF problem.Scheme -%]
-<ncip:ProblemType Scheme="[% problem.Scheme | xml %]">
+<ProblemType Scheme="[% problem.Scheme | xml %]">
 [% ELSE -%]
-<ncip:ProblemType>
+<ProblemType>
 [% END -%]
 [% problem.ProblemType | xml %]
-</ncip:ProblemType>
-<ncip:ProblemDetail>
+</ProblemType>
+<ProblemDetail>
 [% problem.ProblemDetail | xml %]
-</ncip:ProblemDetail>
-<ncip:ProblemElement>
+</ProblemDetail>
+<ProblemElement>
 [% problem.ProblemElement | xml %]
-</ncip:ProblemElement>
-<ncip:ProblemValue>
+</ProblemElement>
+<ProblemValue>
 [% problem.ProblemValue | xml %]
-</ncip:ProblemValue>
-</ncip:Problem>
+</ProblemValue>
+</Problem>
diff --git a/templates/response.tt b/templates/response.tt
index c39a16a..3b8994b 100644
--- a/templates/response.tt
+++ b/templates/response.tt
@@ -1,4 +1,4 @@
-<ncip:[% type %]>
+<[% type %]>
 [% IF header;
       INCLUDE "includes/ResponseHeader.inc";
    END;
@@ -8,4 +8,4 @@
       INCLUDE "includes/problem.inc";
    END;
 -%]
-</ncip:[% type %]>
+</[% type %]>
-- 
2.11.0