diff --git a/classes/controllers/FrmAddonsController.php b/classes/controllers/FrmAddonsController.php
index bf7361e710..83ff457689 100644
--- a/classes/controllers/FrmAddonsController.php
+++ b/classes/controllers/FrmAddonsController.php
@@ -839,12 +839,11 @@ protected static function prepare_addon_link( &$link ) {
 			$link = $site_url . $link;
 		}
 		$link       = FrmAppHelper::make_affiliate_url( $link );
-		$query_args = array(
-			'utm_source'   => 'WordPress',
-			'utm_medium'   => 'addons',
-			'utm_campaign' => 'liteplugin',
+
+		$utm  = array(
+			'campaign' => 'addons',
 		);
-		$link       = add_query_arg( $query_args, $link );
+		$link = FrmAppHelper::maybe_add_missing_utm( $link, $utm );
 	}
 
 	/**
diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php
index 139c5dfd92..1f7124d4de 100644
--- a/classes/controllers/FrmAppController.php
+++ b/classes/controllers/FrmAppController.php
@@ -580,8 +580,8 @@ public static function admin_init() {
 		if ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) && ! FrmAppHelper::pro_is_installed() && current_user_can( 'frm_view_forms' ) ) {
 			$redirect = FrmSalesApi::get_best_sale_value( 'menu_cta_link' );
 			$utm      = array(
-				'medium'  => 'upgrade',
-				'content' => 'submenu-upgrade',
+				'campaign' => 'upgrade',
+				'content'  => 'submenu-upgrade',
 			);
 
 			if ( $redirect ) {
@@ -1334,8 +1334,18 @@ private static function enqueue_floating_links( $plugin_url, $version ) {
 			wp_set_script_translations( 's11-floating-links-config', 's11-' );
 		}
 
+		$upgrade_utm         = array(
+			'campaign' => 'floating-links',
+			'content'  => 'floating-links-upgrade',
+		);
+		$docs_utm            = array(
+			'campaign' => 'floating-links',
+			'content'  => 'floating-links-docs',
+		);
 		$floating_links_data = array(
-			'proIsInstalled' => FrmAppHelper::pro_is_installed(),
+			'proIsInstalled'   => FrmAppHelper::pro_is_installed(),
+			'upgradeUrl'       => FrmAppHelper::admin_upgrade_link( $upgrade_utm ),
+			'documentationUrl' => FrmAppHelper::admin_upgrade_link( $docs_utm, 'knowledgebase/' ),
 		);
 		wp_localize_script( 's11-floating-links-config', 's11FloatingLinksData', $floating_links_data );
 
diff --git a/classes/controllers/FrmDashboardController.php b/classes/controllers/FrmDashboardController.php
index 96dd97d546..0cebe1752f 100644
--- a/classes/controllers/FrmDashboardController.php
+++ b/classes/controllers/FrmDashboardController.php
@@ -256,7 +256,7 @@ private static function view_args_entries_placeholder( $forms_count ) {
 			$copy = sprintf(
 				/* translators: %1$s: HTML start of a tag, %2$s: HTML close a tag */
 				__( 'See the %1$sform documentation%2$s for instructions on publishing your form', 'formidable' ),
-				'<a target="_blank" href="' . FrmAppHelper::admin_upgrade_link( '', 'knowledgebase/publish-a-form/' ) . '">',
+				'<a target="_blank" href="' . esc_url( FrmAppHelper::admin_upgrade_link( '', 'knowledgebase/publish-a-form/' ) ) . '">',
 				'</a>'
 			);
 			return array(
diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php
index 4178637840..dc11ded934 100644
--- a/classes/controllers/FrmFormsController.php
+++ b/classes/controllers/FrmFormsController.php
@@ -306,7 +306,7 @@ public static function update( $values = array() ) {
 			$message .= '<br/> ' . sprintf(
 				/* translators: %1$s: Start link HTML, %2$s: end link HTML */
 				__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
-				'<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
+				'<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
 				'</a>'
 			);
 		}
@@ -318,6 +318,19 @@ public static function update( $values = array() ) {
 		self::get_edit_vars( $id, array(), $message );
 	}
 
+	/**
+	 * @since x.x
+	 *
+	 * @return string
+	 */
+	private static function get_form_too_long_docs_url() {
+		$utm = array(
+			'campaign' => 'builder',
+			'content'  => 'form-too-long',
+		);
+		return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
+	}
+
 	/**
 	 * Remove the draft flag from any new fields from this current session.
 	 *
@@ -353,6 +366,7 @@ private static function maybe_remove_draft_option_from_fields( $form_id ) {
 	 *
 	 * @since 3.06.01
 	 *
+	 * @param array $values
 	 * @return bool
 	 */
 	private static function is_too_long( $values ) {
diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index d07449a6a2..d7ed4b767a 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -115,52 +115,97 @@ public static function get_affiliate() {
 
 	/**
 	 * @since 3.04.02
-	 * @param array|string $args
+	 *
+	 * @param array|string $args If a string is passed, it is used for the utm_campaign attribute.
 	 * @param string       $page
 	 */
 	public static function admin_upgrade_link( $args, $page = '' ) {
-		if ( empty( $page ) ) {
-			$page = 'https://formidableforms.com/lite-upgrade/';
-		} else {
+		if ( $page ) {
 			$page = str_replace( 'https://formidableforms.com/', '', $page );
 			$page = 'https://formidableforms.com/' . $page;
+		} else {
+			$page = 'https://formidableforms.com/lite-upgrade/';
 		}
 
-		$anchor = '';
 		if ( is_array( $args ) ) {
-			$medium = $args['medium'] ?? '';
-			if ( isset( $args['content'] ) ) {
-				$content = $args['content'];
-			}
-			if ( isset( $args['anchor'] ) ) {
-				$anchor = '#' . $args['anchor'];
-			}
+			$args = self::adjust_legacy_utm_args( $args );
 		} else {
-			$medium = $args;
+			$args = array( 'campaign' => $args );
 		}
 
 		$query_args = array(
-			'utm_source'   => 'WordPress',
-			'utm_medium'   => $medium,
-			'utm_campaign' => 'liteplugin',
+			'utm_source' => 'plugin',
+			'utm_medium' => self::get_utm_medium(),
 		);
+		$query_args = self::maybe_add_utm_license( $query_args );
+
+		if ( isset( $args['campaign'] ) ) {
+			$query_args['utm_campaign'] = $args['campaign'];
+		}
 
-		if ( isset( $content ) ) {
-			$query_args['utm_content'] = $content;
+		if ( isset( $args['content'] ) ) {
+			$query_args['utm_content'] = $args['content'];
 		}
 
-		if ( is_array( $args ) && isset( $args['param'] ) ) {
+		if ( isset( $args['param'] ) ) {
 			$query_args['f'] = $args['param'];
 		}
 
-		if ( is_array( $args ) && ! empty( $args['plan'] ) ) {
+		if ( ! empty( $args['plan'] ) ) {
 			$query_args['plan'] = $args['plan'];
 		}
 
-		$link = add_query_arg( $query_args, $page ) . $anchor;
+		$link = add_query_arg( $query_args, $page );
+
+		if ( isset( $args['anchor'] ) ) {
+			$link .= '#' . $args['anchor'];
+		}
+
 		return self::make_affiliate_url( $link );
 	}
 
+	/**
+	 * If medium is "pro", add an additional utm_license param with their active license type.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $query_args
+	 * @return array
+	 */
+	private static function maybe_add_utm_license( $query_args ) {
+		if ( 'pro' === $query_args['utm_medium'] && is_callable( 'FrmProAddonsController::get_readable_license_type' ) ) {
+			$query_args['utm_license'] = strtolower( FrmProAddonsController::get_readable_license_type() );
+		}
+
+		return $query_args;
+	}
+
+	/**
+	 * @since x.x
+	 *
+	 * @return string
+	 */
+	private static function get_utm_medium() {
+		return self::pro_is_connected() ? 'pro' : 'lite';
+	}
+
+	/**
+	 * Change campaign from "liteplugin" to what we're currently using for medium.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	private static function adjust_legacy_utm_args( $args ) {
+		if ( isset( $args['medium'] ) ) {
+			$args['campaign'] = $args['medium'];
+			unset( $args['medium'] );
+		}
+
+		return $args;
+	}
+
 	/**
 	 * @since 6.21
 	 *
@@ -168,24 +213,27 @@ public static function admin_upgrade_link( $args, $page = '' ) {
 	 * @param array  $utm
 	 */
 	public static function maybe_add_missing_utm( $cta_link, $utm ) {
+		$utm        = self::adjust_legacy_utm_args( $utm );
 		$query_args = array();
 
 		if ( false === strpos( $cta_link, 'utm_source' ) ) {
-			$query_args['utm_source'] = 'WordPress';
+			$query_args['utm_source'] = 'plugin';
 		}
 
-		if ( false === strpos( $cta_link, 'utm_campaign' ) ) {
-			$query_args['utm_campaign'] = 'liteplugin';
+		if ( false === strpos( $cta_link, 'utm_medium' ) ) {
+			$query_args['utm_medium'] = self::get_utm_medium();
 		}
 
-		if ( false === strpos( $cta_link, 'utm_medium' ) && isset( $utm['medium'] ) ) {
-			$query_args['utm_medium'] = $utm['medium'];
+		if ( false === strpos( $cta_link, 'utm_campaign' ) && isset( $utm['campaign'] ) ) {
+			$query_args['utm_campaign'] = $utm['campaign'];
 		}
 
 		if ( false === strpos( $cta_link, 'utm_content' ) && isset( $utm['content'] ) ) {
 			$query_args['utm_content'] = $utm['content'];
 		}
 
+		$query_args = self::maybe_add_utm_license( $query_args );
+
 		return $query_args ? add_query_arg( $query_args, $cta_link ) : $cta_link;
 	}
 
@@ -1462,8 +1510,8 @@ public static function print_admin_banner( $should_show_lite_upgrade ) {
 
 				$upgrade_link = FrmSalesApi::get_best_sale_value( 'lite_banner_cta_link' );
 				$utm          = array(
-					'medium'  => 'settings-license',
-					'content' => 'lite-banner',
+					'campaign' => 'settings-license',
+					'content'  => 'lite-banner',
 				);
 
 				if ( $upgrade_link ) {
@@ -3679,19 +3727,7 @@ public static function min_pro_version_notice( $min_version ) {
 			return;
 		}
 
-		$expired = FrmAddonsController::is_license_expired();
-		?>
-		<div class="frm-banner-alert frm_error_style frm_previous_install">
-			<?php
-			esc_html_e( 'You are running a version of Formidable Forms that may not be compatible with your version of Formidable Forms Pro.', 'formidable' );
-			if ( empty( $expired ) ) {
-				echo ' Please <a href="' . esc_url( admin_url( 'plugins.php?s=formidable%20forms%20pro' ) ) . '">update now</a>.';
-			} else {
-				echo '<br/>Please <a href="https://formidableforms.com/account/downloads/?utm_source=WordPress&utm_medium=outdated">renew now</a> to get the latest version.';
-			}
-			?>
-		</div>
-		<?php
+		include self::plugin_path() . '/classes/views/addons/min-version-notice.php';
 	}
 
 	/**
diff --git a/classes/helpers/FrmDashboardHelper.php b/classes/helpers/FrmDashboardHelper.php
index 5249ac9fae..09ee78fe44 100644
--- a/classes/helpers/FrmDashboardHelper.php
+++ b/classes/helpers/FrmDashboardHelper.php
@@ -214,8 +214,8 @@ public static function get_license_buttons() {
 
 		$upgrade_link = FrmSalesApi::get_best_sale_value( 'dashboard_license_cta_link' );
 		$utm          = array(
-			'medium'  => 'settings-license',
-			'content' => 'dashboard-license-box',
+			'campaign' => 'settings-license',
+			'content'  => 'dashboard-license-box',
 		);
 
 		if ( $upgrade_link ) {
diff --git a/classes/helpers/FrmEntriesListHelper.php b/classes/helpers/FrmEntriesListHelper.php
index 579bf6b4e7..5f90b9b8ef 100644
--- a/classes/helpers/FrmEntriesListHelper.php
+++ b/classes/helpers/FrmEntriesListHelper.php
@@ -228,10 +228,14 @@ public function search_box( $text, $input_id ) {
 	protected function display_tablenav( $which ) {
 		$is_footer = ( $which !== 'top' );
 		if ( $is_footer && ! empty( $this->items ) ) {
+			$utm = array(
+				'campaign' => 'spam-protection',
+				'content'  => 'entries-list-spam-protection',
+			);
 			?>
 			<p>
 				<?php esc_html_e( 'Getting spam form submissions?', 'formidable' ); ?>
-				<a href="https://formidableforms.com/knowledgebase/add-spam-protection/" target="_blank">
+				<a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/add-spam-protection/' ) ); ?>" target="_blank">
 					<?php esc_html_e( 'Learn how to prevent them.', 'formidable' ); ?>
 				</a>
 			</p>
diff --git a/classes/models/fields/FrmFieldCaptcha.php b/classes/models/fields/FrmFieldCaptcha.php
index 8ce0dedf44..b84de5acf7 100644
--- a/classes/models/fields/FrmFieldCaptcha.php
+++ b/classes/models/fields/FrmFieldCaptcha.php
@@ -180,6 +180,10 @@ protected function recaptcha_api_url( $frm_settings ) {
 			$api_js_url .= '&hl=' . $lang;
 		}
 
+		// Since this URL initially ends with ? and we never use add_query_arg, remove the extra
+		// & that appears immediately after the ?
+		$api_js_url = str_replace( '?&', '?', $api_js_url );
+
 		/**
 		 * @param string $api_js_url
 		 */
diff --git a/classes/views/addons/min-version-notice.php b/classes/views/addons/min-version-notice.php
new file mode 100644
index 0000000000..f8b1f0ad05
--- /dev/null
+++ b/classes/views/addons/min-version-notice.php
@@ -0,0 +1,20 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'You are not allowed to call this page directly.' );
+}
+?>
+<div class="frm-banner-alert frm_error_style frm_previous_install">
+	<?php esc_html_e( 'You are running a version of Formidable Forms that may not be compatible with your version of Formidable Forms Pro.', 'formidable' ); ?>
+
+	<?php if ( FrmAddonsController::is_license_expired() ) : ?>
+		<?php
+		$utm = array(
+			'campaign' => 'outdated',
+			'content'  => 'min-pro-version-notice',
+		);
+		?>
+		Please <a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( $utm, 'account/downloads/' ) ); ?>">renew now</a> to get the latest version.
+	<?php else : ?>
+		Please <a href="<?php echo esc_url( admin_url( 'plugins.php?s=formidable%20forms%20pro' ) ); ?>">update now</a>.
+	<?php endif; ?>
+</div>
diff --git a/classes/views/addons/upgrade_to_pro.php b/classes/views/addons/upgrade_to_pro.php
deleted file mode 100644
index b5840eb30c..0000000000
--- a/classes/views/addons/upgrade_to_pro.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if ( ! defined( 'ABSPATH' ) ) {
-	die( 'You are not allowed to call this page directly.' );
-}
-_deprecated_file( esc_html( basename( __FILE__ ) ), '6.16' );
diff --git a/classes/views/dashboard/templates/pro-features-list.php b/classes/views/dashboard/templates/pro-features-list.php
index c4238f61e8..8ead97a4f7 100644
--- a/classes/views/dashboard/templates/pro-features-list.php
+++ b/classes/views/dashboard/templates/pro-features-list.php
@@ -20,8 +20,8 @@
 
 $discount_link = FrmSalesApi::get_best_sale_value( 'global_settings_upgrade_cta_link' );
 $utm           = array(
-	'medium'  => 'dashboard-discount',
-	'content' => 'dashboard-defy-limits-cta',
+	'campaign' => 'dashboard-discount',
+	'content'  => 'dashboard-defy-limits-cta',
 );
 if ( $discount_link ) {
 	$discount_link = FrmAppHelper::maybe_add_missing_utm( $discount_link, $utm );
diff --git a/classes/views/frm-entries/no_entries.php b/classes/views/frm-entries/no_entries.php
index 729f12c623..2507225464 100644
--- a/classes/views/frm-entries/no_entries.php
+++ b/classes/views/frm-entries/no_entries.php
@@ -32,10 +32,14 @@
 </div>
 <p class="frm_no_entries_text">
 	<?php
+	$utm = array(
+		'campaign' => 'entries',
+		'content'  => 'no-entries',
+	);
 	printf(
 		/* translators: %1$s: Start link HTML, %2$s: End link HTML, %3$s: Line break HTML */
 		esc_html__( 'See the %1$sform documentation%2$s for instructions on publishing your form', 'formidable' ),
-		'<a href="https://formidableforms.com/knowledgebase/publish-your-forms/?utm_source=WordPress&utm_medium=entries&utm_campaign=liteplugin" target="_blank">',
+		'<a href="' . esc_url( FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/publish-your-forms/' ) ) . '" target="_blank">',
 		'</a>'
 	);
 	?>
diff --git a/classes/views/frm-settings/general.php b/classes/views/frm-settings/general.php
index 8d69e94302..e33c5b35a7 100644
--- a/classes/views/frm-settings/general.php
+++ b/classes/views/frm-settings/general.php
@@ -96,8 +96,16 @@
 </p>
 <p class="frm-text-xs frm-mb-0">
 	<?php
-	// translators: %s: Knowledge base URL
-	printf( esc_html__( 'Learn more about our GDPR settings', 'formidable' ) . ' <a href="%s" target="_blank">%s</a>', 'https://formidableforms.com/knowledgebase/gdpr-settings/', esc_html__( 'here', 'formidable' ) );
+	$gdpr_utm = array(
+		'campaign' => 'gdpr-settings',
+		'content'  => 'gdpr-settings-docs',
+	);
+	printf(
+		// translators: %1$s: Opening tag for a link, %2$s: Closing tag for a link
+		esc_html__( 'Learn more about our GDPR settings %1$shere%2$s', 'formidable' ),
+		'<a href="' . esc_url( FrmAppHelper::admin_upgrade_link( $gdpr_utm, 'knowledgebase/gdpr-settings/' ) ) . '" target="_blank">',
+		'</a>'
+	);
 	?>
 </p>
 <h3 class="frm-mt-xs"><?php esc_html_e( 'Other', 'formidable' ); ?></h3>
diff --git a/classes/views/frm-settings/license_box.php b/classes/views/frm-settings/license_box.php
index 4ffded0727..b227e65da8 100644
--- a/classes/views/frm-settings/license_box.php
+++ b/classes/views/frm-settings/license_box.php
@@ -10,8 +10,8 @@
 
 $button_upgrade_link = FrmSalesApi::get_best_sale_value( 'global_settings_license_cta_link' );
 $utm                 = array(
-	'medium'  => 'settings-license',
-	'content' => 'global-settings-license-box-get-formidable-button',
+	'campaign' => 'settings-license',
+	'content'  => 'global-settings-license-box-get-formidable-button',
 );
 if ( $button_upgrade_link ) {
 	$button_upgrade_link = FrmAppHelper::maybe_add_missing_utm( $button_upgrade_link, $utm );
@@ -26,8 +26,8 @@
 
 $unlock_more_upgrade_link = FrmSalesApi::get_best_sale_value( 'global_settings_unlock_more_cta_link' );
 $utm                      = array(
-	'medium'  => 'settings-license',
-	'content' => 'global-settings-license-box-unlock-more',
+	'campaign' => 'settings-license',
+	'content'  => 'global-settings-license-box-unlock-more',
 );
 if ( $unlock_more_upgrade_link ) {
 	$unlock_more_upgrade_link = FrmAppHelper::maybe_add_missing_utm( $unlock_more_upgrade_link, $utm );
diff --git a/classes/views/shared/admin-footer-links.php b/classes/views/shared/admin-footer-links.php
index b76f08aa6b..ae55f15b30 100644
--- a/classes/views/shared/admin-footer-links.php
+++ b/classes/views/shared/admin-footer-links.php
@@ -8,7 +8,8 @@
 
 $upgrade_link = FrmSalesApi::get_best_sale_value( 'footer_cta_link' );
 $utm          = array(
-	'medium' => 'admin-footer-link',
+	'campaign' => 'admin-footer-link',
+	'content'  => 'footer-link-upgrade',
 );
 if ( $upgrade_link ) {
 	$upgrade_link = FrmAppHelper::maybe_add_missing_utm( $upgrade_link, $utm );
@@ -35,7 +36,13 @@
 	<div class="frm-admin-footer-links-nav">
 		<a href="<?php echo esc_url( $support_link ); ?>" target="_blank"><?php esc_html_e( 'Support', 'formidable' ); ?></a>
 		<span>/</span>
-		<a href="https://formidableforms.com/knowledgebase/" target="_blank"><?php esc_html_e( 'Docs', 'formidable' ); ?></a>
+		<?php
+		$docs_utm = array(
+			'campaign' => 'admin-footer-link',
+			'content'  => 'footer-link-docs',
+		);
+		?>
+		<a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( $docs_utm, 'knowledgebase/' ) ); ?>" target="_blank"><?php esc_html_e( 'Docs', 'formidable' ); ?></a>
 		<?php if ( 'elite' !== FrmAddonsController::license_type() ) : ?>
 			<?php
 			$cta_text = FrmSalesApi::get_best_sale_value( 'footer_cta_text' );
diff --git a/classes/views/shared/views-info.php b/classes/views/shared/views-info.php
index 0ef65d8ea2..3a5c8a8934 100644
--- a/classes/views/shared/views-info.php
+++ b/classes/views/shared/views-info.php
@@ -20,15 +20,20 @@
 		</p>
 		<?php
 		$upgrade_link_args = array(
-			'medium' => 'views-info',
-			'plan'   => 'view',
-			'class'  => 'frm-mb-md frm-button-primary frm-gradient',
-			'text'   => __( 'Get Formidable Views', 'formidable' ),
+			'campaign' => 'views-info',
+			'content'  => 'get-views-button',
+			'plan'     => 'view',
+			'class'    => 'frm-mb-md frm-button-primary frm-gradient',
+			'text'     => __( 'Get Formidable Views', 'formidable' ),
 		);
 		FrmAddonsController::conditional_action_button( 'views', $upgrade_link_args );
-		?>
 
-		<a href="https://formidableforms.com/demos/" class="frm-mb-md frm-ml-xs frm-button-secondary"><?php esc_html_e( 'View Demos', 'formidable' ); ?></a>
+		$demo_link_args = array(
+			'campaign' => 'views-info',
+			'content'  => 'view-demos-button',
+		);
+		?>
+		<a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( $demo_link_args, 'demos/' ) ); ?>" class="frm-mb-md frm-ml-xs frm-button-secondary"><?php esc_html_e( 'View Demos', 'formidable' ); ?></a>
 
 		<div class="frm-views-features frm_grid_container">
 			<div class="frm4">
@@ -99,12 +104,19 @@
 			</div>
 		</div><!--- End .frm-views-features -->
 
+		<?php
+		$learn_more_utm = array(
+			'campaign' => 'views-info',
+			'content'  => 'views-info-learn-more',
+		);
+		?>
+
 		<div class="frm_grid_container">
 			<div class="frm6">
 				<div class="frm-views-learn-more">
 					<h3><?php esc_html_e( 'Learn more', 'formidable' ); ?></h3>
 					<p style="margin-bottom: var(--gap-md);"><?php esc_html_e( 'Bring entries to the front-end of your site for full-featured applications or just to show the content.', 'formidable' ); ?></p>
-					<a href="https://formidableforms.com/features/display-form-data-views/" class="frm-button-secondary"><?php esc_html_e( 'Learn more', 'formidable' ); ?></a>
+					<a href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( $learn_more_utm, 'features/display-form-data-views/' ) ); ?>" class="frm-button-secondary"><?php esc_html_e( 'Learn more', 'formidable' ); ?></a>
 				</div>
 			</div>
 			<div class="frm6">
diff --git a/js/packages/floating-links/config.js b/js/packages/floating-links/config.js
index dd4b774117..5dffdd8682 100644
--- a/js/packages/floating-links/config.js
+++ b/js/packages/floating-links/config.js
@@ -54,7 +54,7 @@
 		{
 			title: __( 'Upgrade', 'formidable' ),
 			icon: frmFloatingLinksConfig.upgradeIcon,
-			url: 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_campaign=liteplugin&utm_medium=upgrade&utm_content=floating-links',
+			url: s11FloatingLinksData.upgradeUrl,
 			openInNewTab: true
 		},
 		{
@@ -66,7 +66,7 @@
 		{
 			title: __( 'Documentation', 'formidable' ),
 			icon: frmFloatingLinksConfig.documentationIcon,
-			url: 'https://formidableforms.com/knowledgebase/',
+			url: s11FloatingLinksData.documentationUrl,
 			openInNewTab: true
 		}
 	];
@@ -78,7 +78,7 @@
 		{
 			title: __( 'Support & Docs', 'formidable' ),
 			icon: frmFloatingLinksConfig.supportIcon,
-			url: 'https://formidableforms.com/knowledgebase/',
+			url: s11FloatingLinksData.documentationUrl,
 			openInNewTab: true
 		}
 	];
diff --git a/tests/cypress/e2e/Add-Ons/validateAddOnsPage.cy.js b/tests/cypress/e2e/Add-Ons/validateAddOnsPage.cy.js
index a03200e4d0..4a4d8ebf54 100644
--- a/tests/cypress/e2e/Add-Ons/validateAddOnsPage.cy.js
+++ b/tests/cypress/e2e/Add-Ons/validateAddOnsPage.cy.js
@@ -13,7 +13,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'h4' ).should( 'contain.text', 'Unlock Add-on library' );
 			cy.get( 'p.frm-m-0' ).should( 'contain.text', 'Upgrade to Pro and access our library of add-ons to supercharge your forms.' );
 			cy.get( 'a.frm-cta-link' )
-				.should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=upgrade-cta' )
+				.should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=upgrade-cta' )
 				.and( 'contain.text', 'Upgrade to PRO' );
 		} );
 		cy.get( '#addon-search-input' ).should( 'exist' );
@@ -154,7 +154,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( '.frm-font-medium.frm-truncate' ).should( 'contain.text', 'Formidable Forms Pro' );
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.' );
-			cy.get( 'a[aria-label="View Docs"]' ).should( 'have.attr', 'href', 'https://formidableforms.com/knowledgebase/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin' )
+			cy.get( 'a[aria-label="View Docs"]' ).should( 'have.attr', 'href', 'https://formidableforms.com/knowledgebase/?utm_source=plugin&utm_medium=lite&utm_campaign=addons' )
 				.and( 'have.attr', 'target', '_blank' )
 				.invoke( 'removeAttr', 'target' ).click();
 		} );
@@ -172,7 +172,7 @@ describe( 'Add-Ons page', () => {
 
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Add an electronic signature to your WordPress form. The visitor may write their signature with a trackpad/mouse or type it.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=signature' )
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=signature' )
 					.and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
@@ -186,7 +186,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_paypal_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Collect instant payments and recurring payments to automate your online business. Calculate a total and send customers on to PayPal.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=paypal-standard' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=paypal-standard' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -198,7 +198,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Add a full forms API for forms, form fields, views, and entries. Then send submissions to other sites with REST APIs.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=formidable-api' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=formidable-api' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -210,7 +210,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_twilio_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Allow users to text their votes for polls created by Formidable Forms, or send SMS notifications when entries are submitted or updated.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=twilio' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=twilio' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -222,7 +222,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_bootstrap_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Instantly add Bootstrap styling to all your Formidable forms.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=bootstrap' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=bootstrap' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -234,7 +234,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_aweber_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'AWeber is a powerful email marketing service. Subscribe contacts to an AWeber mailing list when they submit your WordPress contact forms.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=aweber' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=aweber' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -246,7 +246,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Translate your forms into multiple languages using the Formidable-integrated WPML plugin.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=wp-multilingual' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=wp-multilingual' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -258,7 +258,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Populate fields with Countries, States/Provinces, U.S. Counties, and U.S. Cities. This data can then be used in dependent Data from Entries fields.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=locations' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=locations' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -270,7 +270,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_zapier_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Connect with hundreds of applications through Zapier. Automatically insert a Google spreadsheet row, tweet, or upload to Dropbox.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=zapier' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=zapier' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -282,7 +282,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Track the pages a user visits and the time spent on each page prior to submitting a form.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=user-tracking' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=user-tracking' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -294,7 +294,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_mailchimp_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Get on the path to more leads in minutes. Add and update leads in a Mailchimp mailing list when a form is submitted.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=mailchimp' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=mailchimp' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -306,7 +306,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Give new users access to your site quickly and painlessly. Plus edit profiles and login from the front end.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=user-registration' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=user-registration' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -318,7 +318,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_woocommerce_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Are your WooCommerce product forms too basic? Add custom fields to a product form and collect more data when it is added to the cart.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=woocommerce' ).and( 'contain.text', 'Elite' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=woocommerce' ).and( 'contain.text', 'Elite' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -330,7 +330,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_highrise_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Capture leads in your WordPress contact forms, and save them in your Highrise CRM account too.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=highrise' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=highrise' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -342,7 +342,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_bootstrap_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Open forms, views, other shortcodes, or sections of content in a Bootstrap popup.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=bootstrap-modal' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=bootstrap-modal' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -354,7 +354,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_polylang_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Create bilingual or multilingual forms with help from Polylang.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=polylang' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=polylang' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -366,7 +366,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Schedule email notifications, SMS messages, and API actions.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=autoresponder' ).and( 'contain.text', 'Elite' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=autoresponder' ).and( 'contain.text', 'Elite' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -381,7 +381,7 @@ describe( 'Add-Ons page', () => {
 				expect( normalizedText ).to.contain( 'See your API requests along with their responses from add-ons including Zapier, Formidable API Webhooks, Salesforce and more.' );
 			} );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=logs' ).and( 'contain.text', 'Basic' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=logs' ).and( 'contain.text', 'Basic' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -396,7 +396,7 @@ describe( 'Add-Ons page', () => {
 				expect( normalizedText ).to.contain( 'Add more options to date fields in your forms for so only the dates you choose can be chosen.' );
 			} );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=datepicker-options' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=datepicker-options' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -408,7 +408,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_salesforcealt_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Add new contacts and leads into your Salesforce CRM directly from the WordPress forms on your site.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=salesforce' ).and( 'contain.text', 'Elite' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=salesforce' ).and( 'contain.text', 'Elite' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -423,7 +423,7 @@ describe( 'Add-Ons page', () => {
 				expect( normalizedText ).to.contain( 'Send WordPress newsletters from your own site with MailPoet. And use Formidable to for your newsletter signup forms.' );
 			} );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=mailpoet-newsletters' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=mailpoet-newsletters' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -435,7 +435,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_activecampaign_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Add contacts to any ActiveCampaign list from your WordPress forms.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=activecampaign-wordpress-plugin' ).and( 'contain.text', 'Elite' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=activecampaign-wordpress-plugin' ).and( 'contain.text', 'Elite' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -447,7 +447,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_getresponse_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Collect leads in WordPress forms and automatically add them in GetResponse. Then trigger automatic emails and other GetResponse marketing automations.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=getresponse-wordpress-plugin' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=getresponse-wordpress-plugin' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -459,7 +459,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Turn your forms into automated quizzes. Add questions and submit the quiz key. Then all the grading is done for you.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=quiz-maker' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=quiz-maker' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -471,7 +471,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_constant_contact_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Setup WordPress forms to create leads automatically in Constant Contact. Just select a list and match up form fields.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=constant-contact' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=constant-contact' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -483,7 +483,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_campaignmonitor_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Save time by automatically sending leads from WordPress forms to Campaign Monitor.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=campaign-monitor' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=campaign-monitor' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -495,7 +495,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Easily create custom CSV files and allow users to export their data from the front-end of your site.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=export-view' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=export-view' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -507,7 +507,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Create WordPress web apps to display your form submissions in grids, tables, calendars, and more.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=visual-views' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=visual-views' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -519,7 +519,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Transform your WordPress site into a data collection machine with our user-friendly survey form builder.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=surveys' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=surveys' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -531,7 +531,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Create beautiful landing pages fast and rake in new leads.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=landing-pages' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=landing-pages' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -543,7 +543,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Ask one question at a time to humanize forms and boost their conversion rates.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=conversational-forms' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=conversational-forms' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -555,7 +555,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Get more accurate data and make forms faster to complete with address autocomplete.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=geolocation' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=geolocation' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -567,7 +567,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Create PDFs from form entries automatically. Email them or let visitors download PDFs from your site.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=pdfs' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=pdfs' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -579,7 +579,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_googlesheets_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Send form entries to a Google spreadsheet as a backup or for extra processing.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=google-sheets' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=google-sheets' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -591,7 +591,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_acfforms_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Sync custom fields between Formidable and Advanced Custom Fields or ACF Pro.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=acf-forms' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=acf-forms' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -603,7 +603,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm-ai-form-icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Get back your time by autogenerating a response from ChatGPT and inserting it into a field.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=ai' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=ai' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -618,7 +618,7 @@ describe( 'Add-Ons page', () => {
 				expect( normalizedText ).to.contain( "Capture form data before it's submitted to save more leads and optimize forms. Plus, auto save drafts and allow logged out editing." );
 			} );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=abandonment' ).and( 'contain.text', 'Business' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=abandonment' ).and( 'contain.text', 'Business' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -630,7 +630,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_logo_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Transform form data into insightful graphs with ease.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=charts' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=charts' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
@@ -642,7 +642,7 @@ describe( 'Add-Ons page', () => {
 			cy.get( 'svg.frmsvg > use' ).should( 'have.attr', 'xlink:href', '#frm_convertkit_icon' );
 			cy.get( 'p.frm-line-clamp-2' ).should( 'contain.text', 'Bring automation into your email marketing plan for the power to say "welcome" to your subscribers the moment they opt-in to your list.' );
 			cy.contains( 'Plan required:' ).within( () => {
-				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=WordPress&utm_medium=addons&utm_campaign=liteplugin&utm_content=convertkit' ).and( 'contain.text', 'Plus' );
+				cy.get( 'a' ).should( 'have.attr', 'href', 'https://formidableforms.com/lite-upgrade/?utm_source=plugin&utm_medium=lite&utm_campaign=addons&utm_content=convertkit' ).and( 'contain.text', 'Plus' );
 			} );
 			cy.get( 'a[aria-label="Upgrade Now"]' ).should( 'have.attr', 'target', '_blank' )
 				.and( 'have.attr', 'href' ).and( 'include', 'https://formidableforms.com/lite-upgrade/' );
diff --git a/tests/cypress/e2e/Applications/validateApplicationsPage.cy.js b/tests/cypress/e2e/Applications/validateApplicationsPage.cy.js
index e81e2b119c..d821131e5e 100644
--- a/tests/cypress/e2e/Applications/validateApplicationsPage.cy.js
+++ b/tests/cypress/e2e/Applications/validateApplicationsPage.cy.js
@@ -67,7 +67,7 @@ describe( 'Applications page', () => {
 				cy.get( '.frm_modal_footer a.button-secondary' )
 					.should( 'contain.text', 'Learn More' )
 					.and( 'have.attr', 'href' )
-					.and( 'include', 'https://formidableforms.com/view-templates/business-directory-template?utm_source=WordPress&utm_medium=applications&utm_campaign=liteplugin&utm_content=upgrade' );
+					.and( 'include', 'https://formidableforms.com/view-templates/business-directory-template?utm_source=plugin&utm_medium=lite&utm_campaign=applications&utm_content=upgrade' );
 				cy.get( '.frm_modal_footer a.button-primary' )
 					.should( 'contain.text', 'Upgrade Now' )
 					.invoke( 'removeAttr', 'target' )
@@ -195,7 +195,7 @@ describe( 'Applications page', () => {
 				cy.get( '.frm_modal_footer a.button-secondary' )
 					.should( 'contain.text', 'Learn More' )
 					.and( 'have.attr', 'href' )
-					.and( 'include', 'https://formidableforms.com/view-templates/letter-of-recommendation-template?utm_source=WordPress&utm_medium=applications&utm_campaign=liteplugin&utm_content=upgrade' );
+					.and( 'include', 'https://formidableforms.com/view-templates/letter-of-recommendation-template?utm_source=plugin&utm_medium=lite&utm_campaign=applications&utm_content=upgrade' );
 				cy.get( '.frm_modal_footer a.button-primary' )
 					.should( 'contain.text', 'Upgrade Now' )
 					.invoke( 'removeAttr', 'target' )
@@ -311,7 +311,7 @@ describe( 'Applications page', () => {
 				cy.get( '.frm_modal_footer a.button-secondary' )
 					.should( 'contain.text', 'Learn More' )
 					.and( 'have.attr', 'href' )
-					.and( 'include', 'https://formidableforms.com/view-templates/testimonials-template?utm_source=WordPress&utm_medium=applications&utm_campaign=liteplugin&utm_content=upgrade' );
+					.and( 'include', 'https://formidableforms.com/view-templates/testimonials-template?utm_source=plugin&utm_medium=lite&utm_campaign=applications&utm_content=upgrade' );
 				cy.get( '.frm_modal_footer a.button-primary' )
 					.should( 'contain.text', 'Upgrade Now' )
 					.invoke( 'removeAttr', 'target' )