diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js
index 292c3f71c1..ba7c76cc55 100644
--- a/ui/src/app/rulechain/rulechain.controller.js
+++ b/ui/src/app/rulechain/rulechain.controller.js
@@ -1180,7 +1180,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
         var saveRuleChainPromise;
         if (vm.isImport) {
             if (angular.isUndefined(vm.ruleChain.type)) {
-                vm.ruleChain.type = types.systemRuleChainType;
+                vm.ruleChain.type = types.coreRuleChainType;
             }
             saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain);
         } else {
@@ -1269,7 +1269,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
                             vm.isDirty = false;
                             vm.isImport = false;
                             $mdUtil.nextTick(() => {
-                                if (vm.ruleChain.type === vm.types.systemRuleChainType) {
+                                if (vm.ruleChain.type === vm.types.coreRuleChainType) {
                                     $state.go('home.ruleChains.core.ruleChain', {ruleChainId: vm.ruleChain.id.id});
                                 } else {
                                     $state.go('home.ruleChains.edge.ruleChain', {ruleChainId: vm.ruleChain.id.id});
@@ -1293,7 +1293,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
         ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration);
 
         var ruleChainId = vm.ruleChain.id ? vm.ruleChain.id.id : null;
-        var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.systemRuleChainType;
+        var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.coreRuleChainType;
 
         vm.enableHotKeys = false;
 
diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js
index 08dc2f522e..a3f533eb57 100644
--- a/ui/src/app/rulechain/rulechain.routes.js
+++ b/ui/src/app/rulechain/rulechain.routes.js
@@ -82,7 +82,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
                 ruleNodeComponents:
                 /*@ngInject*/
                     function($stateParams, ruleChainService) {
-                        return ruleChainService.getRuleNodeComponents(types.systemRuleChainType);
+                        return ruleChainService.getRuleNodeComponents(types.coreRuleChainType);
                     }
             },
             data: {
diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js
index aba5c3bb2a..01037d77a4 100644
--- a/ui/src/app/rulechain/rulechains.controller.js
+++ b/ui/src/app/rulechain/rulechains.controller.js
@@ -114,7 +114,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
 
         if (vm.ruleChainsScope === 'tenant') {
             fetchRuleChainsFunction = function (pageLink) {
-                return fetchRuleChains(pageLink, types.systemRuleChainType);
+                return fetchRuleChains(pageLink, types.coreRuleChainType);
             };
             deleteRuleChainFunction = function (ruleChainId) {
                 return deleteRuleChain(ruleChainId);
@@ -162,9 +162,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
             });
             vm.ruleChainGridConfig.addItemActions.push({
                 onAction: function ($event) {
-                    importExport.importRuleChain($event, types.systemRuleChainType).then(
+                    importExport.importRuleChain($event, types.coreRuleChainType).then(
                         function(ruleChainImport) {
-                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.systemRuleChainType});
+                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.coreRuleChainType});
                         }
                     );
                 },
@@ -385,7 +385,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
             if (vm.ruleChainsScope === 'edges') {
                 ruleChain.type = types.edgeRuleChainType;
             } else {
-                ruleChain.type = types.systemRuleChainType;
+                ruleChain.type = types.coreRuleChainType;
             }
         }
         return ruleChainService.saveRuleChain(ruleChain);