diff --git a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-canvas.jsx b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-canvas.jsx
index 46c88d4778..42d5eb32eb 100644
--- a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-canvas.jsx
+++ b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-canvas.jsx
@@ -103,7 +103,7 @@ export default class ReactNodesCarbonCanvas extends React.Component {
 	}
 
 	layoutHandler(node) {
-		if (node.op === "shape-node") {
+		if (node?.op && node.op.includes("shape-node")) {
 			const config = {
 				selectionPath: "M -4 -4 h 36 v 36 h -36 Z",
 				nodeExternalObject: ShapeNodeWrapper,
diff --git a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-flow.json b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-flow.json
index 22cef8d4ef..d9a624182f 100644
--- a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-flow.json
+++ b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-flow.json
@@ -11,7 +11,7 @@
         {
           "id": "178a4e3c-6cdf-4465-914d-b9d71c5ef6b8",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-square",
           "app_data": {
             "react_nodes_data": {
               "shape": "square"
@@ -56,7 +56,7 @@
         {
           "id": "8a9fbf9d-88b0-4ccc-a0bb-55e2defcb973",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-circle",
           "app_data": {
             "react_nodes_data": {
               "shape": "circle"
@@ -108,7 +108,7 @@
         {
           "id": "d904953e-ca2f-4c4d-b593-f71dbd99fe5d",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-rounded-square",
           "app_data": {
             "react_nodes_data": {
               "shape": "rounded-square"
@@ -258,7 +258,7 @@
         {
           "id": "5d47eb47-bac4-4f47-a279-01d39133f118",
           "type": "execution_node",
-          "op": "regular-card-node",
+          "op": "card-node-with-color",
           "app_data": {
             "react_nodes_data": {
               "color": "#EAC348"
@@ -310,7 +310,7 @@
         {
           "id": "54cc0a7e-abf0-496e-992d-573a73ace37d",
           "type": "execution_node",
-          "op": "card-node-regular",
+          "op": "card-node-regular-curved-corners",
           "app_data": {
             "react_nodes_data": {
               "shape": "curved-corners"
@@ -362,7 +362,7 @@
         {
           "id": "3248f99f-30b9-441f-8c81-931122a0bfce",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-rounded-square",
           "app_data": {
             "react_nodes_data": {
               "shape": "rounded-square"
@@ -492,7 +492,7 @@
         {
           "id": "b134fd69-1ea8-4f0e-8ead-3ada4914b654",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-circle",
           "app_data": {
             "react_nodes_data": {
               "shape": "circle"
@@ -544,7 +544,7 @@
         {
           "id": "08384753-ad6e-4ee7-abab-e7ede93d3b50",
           "type": "execution_node",
-          "op": "regular-card-node",
+          "op": "card-node-with-color",
           "app_data": {
             "react_nodes_data": {
               "color": "#EAC348"
diff --git a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-palette.json b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-palette.json
index f5e9d4dffe..88c92b0b2c 100644
--- a/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-palette.json
+++ b/canvas_modules/harness/src/client/components/custom-canvases/react-nodes-carbon/react-nodes-carbon-palette.json
@@ -94,7 +94,7 @@
         {
           "id": "",
           "type": "execution_node",
-          "op": "regular-card-node",
+          "op": "card-node-with-color",
           "outputs": [
             {
               "id": "outPort",
@@ -139,7 +139,7 @@
         {
           "id": "",
           "type": "execution_node",
-          "op": "card-node-regular",
+          "op": "card-node-regular-curved-corners",
           "outputs": [
             {
               "id": "outPort",
@@ -192,7 +192,7 @@
         {
           "id": "",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-square",
           "inputs": [
             {
               "id": "inPort",
@@ -237,7 +237,7 @@
         {
           "id": "",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-circle",
           "inputs": [
             {
               "id": "inPort",
@@ -282,7 +282,7 @@
         {
           "id": "",
           "type": "execution_node",
-          "op": "shape-node",
+          "op": "shape-node-rounded-square",
           "inputs": [
             {
               "id": "inPort",