diff --git a/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js b/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js
index 3f2e1c1..be07fa7 100644
--- a/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js
+++ b/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js
@@ -1,24 +1,27 @@
-/*
- * Copyright © 2016-2017 European Support Limited
+/*!
+ * Copyright © 2016-2018 European Support Limited
  *
  * 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 keyMirror from 'nfvo-utils/KeyMirror.js';
 
-export const actionTypes = keyMirror({
-    SHOW: null,
-    HIDE: null,
+export const actionTypes = keyMirror(
+    {
+        SHOW: null,
+        HIDE: null,
 
-    SEND_REQUEST: 'SEND_REQUEST',
-    RECEIVE_RESPONSE: 'RECEIVE_RESPONSE'
-});
+        SEND_REQUEST: null,
+        RECEIVE_RESPONSE: null
+    },
+    'loader'
+);
diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModalConstants.js b/openecomp-ui/src/nfvo-components/modal/GlobalModalConstants.js
index e9c1853..8bac377 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModalConstants.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModalConstants.js
@@ -1,5 +1,5 @@
 /*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2016-2018 European Support Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,16 @@
  */
 import keyMirror from 'nfvo-utils/KeyMirror.js';
 
-export const actionTypes = keyMirror({
-    GLOBAL_MODAL_SHOW: null,
-    GLOBAL_MODAL_CLOSE: null,
-    GLOBAL_MODAL_ERROR: null,
-    GLOBAL_MODAL_WARNING: null,
-    GLOBAL_MODAL_SUCCESS: null
-});
+export const actionTypes = keyMirror(
+    {
+        GLOBAL_MODAL_SHOW: null,
+        GLOBAL_MODAL_CLOSE: null,
+        GLOBAL_MODAL_ERROR: null,
+        GLOBAL_MODAL_WARNING: null,
+        GLOBAL_MODAL_SUCCESS: null
+    },
+    'globalModal'
+);
 
 export const typeEnum = {
     DEFAULT: 'default',
diff --git a/openecomp-ui/src/nfvo-components/notification/NotificationsConstants.js b/openecomp-ui/src/nfvo-components/notification/NotificationsConstants.js
index 329c557..328e046 100644
--- a/openecomp-ui/src/nfvo-components/notification/NotificationsConstants.js
+++ b/openecomp-ui/src/nfvo-components/notification/NotificationsConstants.js
@@ -16,8 +16,8 @@
 import UUID from 'uuid-js';
 
 export const actionTypes = {
-    ADD_NOTIFICATION: 'ADD_NOTIFICATION',
-    REMOVE_NOTIFICATION: 'REMOVE_NOTIFICATION'
+    ADD_NOTIFICATION: 'notifications/ADD_NOTIFICATION',
+    REMOVE_NOTIFICATION: 'notifications/REMOVE_NOTIFICATION'
 };
 
 export const notificationActions = {