2 files changed, 12 insertions, 12 deletions

diff --git a/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js b/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js
index 146d5285d9..e7f37e3768 100644
--- a/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js
+++ b/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js
@@ -1,17 +1,17 @@
-/*
- * Copyright © 2016-2017 European Support Limited
+/*!
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 import store from 'sdc-app/AppStore.js';
 import React from 'react';
@@ -29,7 +29,7 @@ function showVariablesInMessage(variables, msg) {
 	return msg;
 }
 
-function parseATTExceptionObject(responseJSON) {
+function parseCatalogExceptionObject(responseJSON) {
 	let title, msg;
 	if (responseJSON.requestError && responseJSON.requestError.policyException) {
 		title = 'Error: ' + responseJSON.requestError.policyException.messageId;
@@ -57,7 +57,7 @@ function parseATTExceptionObject(responseJSON) {
 var errorResponseHandler = (error) => {
 	let errorData;
 	if (error.data) {
-		errorData = parseATTExceptionObject(error.data);
+		errorData = parseCatalogExceptionObject(error.data);
 	}
 	else {
 		errorData = {
diff --git a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
index 01819844c7..bd08cbb676 100644
--- a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
+++ b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
@@ -48,10 +48,10 @@ function applySecurity(options, data) {
 		headers[AUTHORIZATION_HEADER] = authToken;
 	}
 
-	let attApiHeaders = Configuration.get('ATTApiHeaders'),
-		attUidHeader = attApiHeaders && attApiHeaders.userId;
-	if (attUidHeader) {
-		headers[attUidHeader.name] = attUidHeader.value;
+	let catalogApiHeaders = Configuration.get('CatalogApiHeaders'),
+		catalogUidHeader = catalogApiHeaders && catalogApiHeaders.userId;
+	if (catalogUidHeader) {
+		headers[catalogUidHeader.name] = catalogUidHeader.value;
 	}
 
 	headers[REQUEST_ID_HEADER] = uuid.create().toString();