diff --git a/packages/nodes-base/credentials/ShopifyApi.credentials.ts b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
index ce39d6410d..291f6af1f0 100644
--- a/packages/nodes-base/credentials/ShopifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
@@ -22,8 +22,8 @@ export class ShopifyApi implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Shop Name',
-			name: 'shopName',
+			displayName: 'Shop Subdomain',
+			name: 'shopSubdomain',
 			required: true,
 			type: 'string' as NodePropertyTypes,
 			default: '',
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index 728f439f82..d7e0634d0c 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -24,7 +24,7 @@ export async function shopifyApiRequest(this: IHookFunctions | IExecuteFunctions
 		headers: headerWithAuthentication,
 		method,
 		qs: query,
-		uri: uri || `https://${credentials.shopName}.myshopify.com/admin/api/2019-10${resource}`,
+		uri: uri || `https://${credentials.shopSubdomain}.myshopify.com/admin/api/2019-10${resource}`,
 		body,
 		json: true
 	};
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index a2eaf6a4d0..bd820833ee 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -53,239 +53,239 @@ export class ShopifyTrigger implements INodeType {
 				options:
 					[
 						{
-						  name: 'app uninstalled',
+						  name: 'App uninstalled',
 						  value: 'app/uninstalled'
 						},
 						{
-						  name: 'carts create',
+						  name: 'Carts create',
 						  value: 'carts/create'
 						},
 						{
-						  name: 'carts update',
+						  name: 'Carts update',
 						  value: 'carts/update'
 						},
 						{
-						  name: 'checkouts create',
+						  name: 'Checkouts create',
 						  value: 'checkouts/create'
 						},
 						{
-						  name: 'checkouts delete',
+						  name: 'Checkouts delete',
 						  value: 'checkouts/delete'
 						},
 						{
-						  name: 'checkouts update',
+						  name: 'Checkouts update',
 						  value: 'checkouts/update'
 						},
 						{
-						  name: 'collection_listings add',
+						  name: 'Collection listings add',
 						  value: 'collection_listings/add'
 						},
 						{
-						  name: 'collection_listings remove',
+						  name: 'Collection listings remove',
 						  value: 'collection_listings/remove'
 						},
 						{
-						  name: 'collection_listings update',
+						  name: 'Collection listings update',
 						  value: 'collection_listings/update'
 						},
 						{
-						  name: 'collections create',
+						  name: 'Collections create',
 						  value: 'collections/create'
 						},
 						{
-						  name: 'collections delete',
+						  name: 'Collections delete',
 						  value: 'collections/delete'
 						},
 						{
-						  name: 'collections update',
+						  name: 'Collections update',
 						  value: 'collections/update'
 						},
 						{
-						  name: 'customer_groups create',
+						  name: 'Customer groups create',
 						  value: 'customer_groups/create'
 						},
 						{
-						  name: 'customer_groups delete',
+						  name: 'Customer groups delete',
 						  value: 'customer_groups/delete'
 						},
 						{
-						  name: 'customer_groups update',
+						  name: 'Customer groups update',
 						  value: 'customer_groups/update'
 						},
 						{
-						  name: 'customers create',
+						  name: 'Customers create',
 						  value: 'customers/create'
 						},
 						{
-						  name: 'customers delete',
+						  name: 'Customers delete',
 						  value: 'customers/delete'
 						},
 						{
-						  name: 'customers disable',
+						  name: 'Customers disable',
 						  value: 'customers/disable'
 						},
 						{
-						  name: 'customers enable',
+						  name: 'Customers enable',
 						  value: 'customers/enable'
 						},
 						{
-						  name: 'customers update',
+						  name: 'Customers update',
 						  value: 'customers/update'
 						},
 						{
-						  name: 'draft_orders create',
+						  name: 'Draft orders create',
 						  value: 'draft_orders/create'
 						},
 						{
-						  name: 'draft_orders delete',
+						  name: 'Draft orders delete',
 						  value: 'draft_orders/delete'
 						},
 						{
-						  name: 'draft_orders update',
+						  name: 'Draft orders update',
 						  value: 'draft_orders/update'
 						},
 						{
-						  name: 'fulfillment_events create',
+						  name: 'Fulfillment events create',
 						  value: 'fulfillment_events/create'
 						},
 						{
-						  name: 'fulfillment_events delete',
+						  name: 'Fulfillment events delete',
 						  value: 'fulfillment_events/delete'
 						},
 						{
-						  name: 'fulfillments create',
+						  name: 'Fulfillments create',
 						  value: 'fulfillments/create'
 						},
 						{
-						  name: 'fulfillments update',
+						  name: 'Fulfillments update',
 						  value: 'fulfillments/update'
 						},
 						{
-						  name: 'inventory_items create',
+						  name: 'Inventory_items create',
 						  value: 'inventory_items/create'
 						},
 						{
-						  name: 'inventory_items delete',
+						  name: 'Inventory_items delete',
 						  value: 'inventory_items/delete'
 						},
 						{
-						  name: 'inventory_items update',
+						  name: 'Inventory_items update',
 						  value: 'inventory_items/update'
 						},
 						{
-						  name: 'inventory_levels connect',
+						  name: 'Inventory_levels connect',
 						  value: 'inventory_levels/connect'
 						},
 						{
-						  name: 'inventory_levels disconnect',
+						  name: 'Inventory_levels disconnect',
 						  value: 'inventory_levels/disconnect'
 						},
 						{
-						  name: 'inventory_levels update',
+						  name: 'Inventory_levels update',
 						  value: 'inventory_levels/update'
 						},
 						{
-						  name: 'locales create',
+						  name: 'Locales create',
 						  value: 'locales/create'
 						},
 						{
-						  name: 'locales update',
+						  name: 'Locales update',
 						  value: 'locales/update'
 						},
 						{
-						  name: 'locations create',
+						  name: 'Locations create',
 						  value: 'locations/create'
 						},
 						{
-						  name: 'locations delete',
+						  name: 'Locations delete',
 						  value: 'locations/delete'
 						},
 						{
-						  name: 'locations update',
+						  name: 'Locations update',
 						  value: 'locations/update'
 						},
 						{
-						  name: 'order_transactions create',
+						  name: 'Order transactions create',
 						  value: 'order_transactions/create'
 						},
 						{
-						  name: 'orders cancelled',
+						  name: 'Orders cancelled',
 						  value: 'orders/cancelled'
 						},
 						{
-						  name: 'orders create',
+						  name: 'Orders create',
 						  value: 'orders/create'
 						},
 						{
-						  name: 'orders delete',
+						  name: 'Orders delete',
 						  value: 'orders/delete'
 						},
 						{
-						  name: 'orders fulfilled',
+						  name: 'Orders fulfilled',
 						  value: 'orders/fulfilled'
 						},
 						{
-						  name: 'orders paid',
+						  name: 'Orders paid',
 						  value: 'orders/paid'
 						},
 						{
-						  name: 'orders partially_fulfilled',
+						  name: 'Orders partially fulfilled',
 						  value: 'orders/partially_fulfilled'
 						},
 						{
-						  name: 'orders updated',
+						  name: 'Orders updated',
 						  value: 'orders/updated'
 						},
 						{
-						  name: 'product_listings add',
+						  name: 'Product listings add',
 						  value: 'product_listings/add'
 						},
 						{
-						  name: 'product_listings remove',
+						  name: 'Product listings remove',
 						  value: 'product_listings/remove'
 						},
 						{
-						  name: 'product_listings update',
+						  name: 'Product listings update',
 						  value: 'product_listings/update'
 						},
 						{
-						  name: 'products create',
+						  name: 'Products create',
 						  value: 'products/create'
 						},
 						{
-						  name: 'products delete',
+						  name: 'Products delete',
 						  value: 'products/delete'
 						},
 						{
-						  name: 'products update',
+						  name: 'Products update',
 						  value: 'products/update'
 						},
 						{
-						  name: 'refunds create',
+						  name: 'Refunds create',
 						  value: 'refunds/create'
 						},
 						{
-						  name: 'shop update',
+						  name: 'Shop update',
 						  value: 'shop/update'
 						},
 						{
-						  name: 'tender_transactions create',
+						  name: 'Tender transactions create',
 						  value: 'tender_transactions/create'
 						},
 						{
-						  name: 'themes create',
+						  name: 'Themes create',
 						  value: 'themes/create'
 						},
 						{
-						  name: 'themes delete',
+						  name: 'Themes delete',
 						  value: 'themes/delete'
 						},
 						{
-						  name: 'themes publish',
+						  name: 'Themes publish',
 						  value: 'themes/publish'
 						},
 						{
-						  name: 'themes update',
+						  name: 'Themes update',
 						  value: 'themes/update'
 						}
 					],
diff --git a/packages/nodes-base/nodes/Shopify/shopify.png b/packages/nodes-base/nodes/Shopify/shopify.png
index ab5993cb65..938dbd0bc4 100644
Binary files a/packages/nodes-base/nodes/Shopify/shopify.png and b/packages/nodes-base/nodes/Shopify/shopify.png differ
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 23637be547..8b4e66608e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -41,9 +41,9 @@
             "dist/credentials/HttpBasicAuth.credentials.js",
             "dist/credentials/HttpDigestAuth.credentials.js",
             "dist/credentials/HttpHeaderAuth.credentials.js",
+            "dist/credentials/Imap.credentials.js",
             "dist/credentials/IntercomApi.credentials.js",
-			"dist/credentials/Imap.credentials.js",
-			"dist/credentials/JiraSoftwareCloudApi.credentials.js",
+            "dist/credentials/JiraSoftwareCloudApi.credentials.js",
             "dist/credentials/LinkFishApi.credentials.js",
             "dist/credentials/MailchimpApi.credentials.js",
             "dist/credentials/MailgunApi.credentials.js",
@@ -57,10 +57,10 @@
             "dist/credentials/PayPalApi.credentials.js",
             "dist/credentials/Redis.credentials.js",
             "dist/credentials/RocketchatApi.credentials.js",
+            "dist/credentials/ShopifyApi.credentials.js",
             "dist/credentials/SlackApi.credentials.js",
             "dist/credentials/Smtp.credentials.js",
-			"dist/credentials/StripeApi.credentials.js",
-			"dist/credentials/ShopifyApi.credentials.js",
+            "dist/credentials/StripeApi.credentials.js",
             "dist/credentials/TelegramApi.credentials.js",
             "dist/credentials/TodoistApi.credentials.js",
             "dist/credentials/TrelloApi.credentials.js",