diff --git a/README.md b/README.md
index 6d6cf0cd7..3cb7b9340 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
 * Automatically classify content and images on save
 * Automatically generate alt text and image tags for images
 * Automatically scan images and PDF files for embedded text and save for use in WordPress
-* [Smartly crop images](https://docs.microsoft.com/en-us/rest/api/cognitiveservices/computervision/generatethumbnail) around a region of interest identified by Computer Vision
+* [Smartly crop images](https://docs.microsoft.com/en-us/rest/api/computervision/3.1/generate-thumbnail/generate-thumbnail) around a region of interest identified by Computer Vision
 * Bulk classify content with [WP-CLI](https://wp-cli.org/)
 
 | Language Processing - Tagging | Image Processing - Alt Text | Image Processing - Smart Cropping | Image Processing - Tagging |
@@ -121,7 +121,7 @@ Note that [Computer Vision](https://docs.microsoft.com/en-us/azure/cognitive-ser
 - In the `API Key` field, enter your `KEY 1`.
 
 #### 3. Enable specific Image Processing features
-- Choose to `Automatically Caption Images`, `Automatically Tag Images`, `Enable smart cropping`, and/or `Enable OCR`.
+- Choose to `Generate alt text`, `Tag images`, `Enable smart cropping`, and/or `Scan image or PDF for text`.
 - For features that have thresholds or taxonomy settings, set those as well.
 
 #### 4. Save Image or PDF file or run WP CLI command to batch classify your content
diff --git a/includes/Classifai/Providers/Azure/ComputerVision.php b/includes/Classifai/Providers/Azure/ComputerVision.php
index 86004f65c..ad4f4b0dd 100644
--- a/includes/Classifai/Providers/Azure/ComputerVision.php
+++ b/includes/Classifai/Providers/Azure/ComputerVision.php
@@ -236,10 +236,10 @@ public function setup_attachment_meta_box( $post ) {
 	 */
 	public function attachment_data_meta_box( $post ) {
 		$settings   = get_option( 'classifai_computer_vision' );
-		$captions   = get_post_meta( $post->ID, '_wp_attachment_image_alt', true ) ? __( 'Rescan Alt Text', 'classifai' ) : __( 'Scan Alt Text', 'classifai' );
-		$tags       = ! empty( wp_get_object_terms( $post->ID, 'classifai-image-tags' ) ) ? __( 'Rescan Tags', 'classifai' ) : __( 'Generate Tags', 'classifai' );
-		$ocr        = get_post_meta( $post->ID, 'classifai_computer_vision_ocr', true ) ? __( 'Rescan Text', 'classifai' ) : __( 'Scan Text', 'classifai' );
-		$smart_crop = get_transient( 'classifai_azure_computer_vision_smart_cropping_latest_response' ) ? __( 'Regenerate Smart Thumbnail', 'classifai' ) : __( 'Generate Smart Thumbnail', 'classifai' );
+		$captions   = get_post_meta( $post->ID, '_wp_attachment_image_alt', true ) ? __( 'No alt text? Rescan image', 'classifai' ) : __( 'Generate alt text', 'classifai' );
+		$tags       = ! empty( wp_get_object_terms( $post->ID, 'classifai-image-tags' ) ) ? __( 'Rescan image for new tags', 'classifai' ) : __( 'Generate image tags', 'classifai' );
+		$ocr        = get_post_meta( $post->ID, 'classifai_computer_vision_ocr', true ) ? __( 'Rescan for text', 'classifai' ) : __( 'Scan image for text', 'classifai' );
+		$smart_crop = get_transient( 'classifai_azure_computer_vision_smart_cropping_latest_response' ) ? __( 'Regenerate smart thumbnail', 'classifai' ) : __( 'Create smart thumbnail', 'classifai' );
 		?>
 		<div class="misc-publishing-actions">
 			<div class="misc-pub-section">
@@ -280,7 +280,7 @@ public function attachment_data_meta_box( $post ) {
 	 * @param \WP_Post $post The post object.
 	 */
 	public function attachment_pdf_data_meta_box( $post ) {
-		$read = empty( get_the_content( null, false, $post ) ) ? __( 'Scan PDF content', 'classifai' ) : __( 'Rescan PDF content', 'classifai' );
+		$read   = empty( get_the_content( null, false, $post ) ) ? __( 'Scan PDF for text', 'classifai' ) : __( 'Rescan PDF for text', 'classifai' );
 		$status = get_post_meta( $post->ID, '_classifai_azure_read_status', true );
 		if ( ! empty( $status['status'] ) && 'running' === $status['status'] ) {
 			$running = true;
@@ -748,7 +748,7 @@ public function setup_fields_sections() {
 				'label_for'     => 'url',
 				'input_type'    => 'text',
 				'default_value' => $default_settings['url'],
-				'description'   => __( 'e.g. <code>https://REGION.api.cognitive.microsoft.com/</code>', 'classifai' ),
+				'description'   => __( 'Supported protocol and hostname endpoints, e.g., <code>https://REGION.api.cognitive.microsoft.com</code> or <code>https://EXAMPLE.cognitiveservices.azure.com</code>. This can look different based on your setting choices in Azure.', 'classifai' ),
 			]
 		);
 		add_settings_field(
@@ -765,7 +765,7 @@ public function setup_fields_sections() {
 		);
 		add_settings_field(
 			'enable-image-captions',
-			esc_html__( 'Automatically Caption Images', 'classifai' ),
+			esc_html__( 'Generate alt text', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -773,12 +773,12 @@ public function setup_fields_sections() {
 				'label_for'     => 'enable_image_captions',
 				'input_type'    => 'checkbox',
 				'default_value' => $default_settings['enable_image_captions'],
-				'description'   => __( 'Images will be captioned with alt text upon upload', 'classifai' ),
+				'description'   => __( 'The alt text field will be filled out automatically.', 'classifai' ),
 			]
 		);
 		add_settings_field(
 			'caption-threshold',
-			esc_html__( 'Caption Confidence Threshold', 'classifai' ),
+			esc_html__( 'Alt text confidence threshold', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -786,12 +786,12 @@ public function setup_fields_sections() {
 				'label_for'     => 'caption_threshold',
 				'input_type'    => 'number',
 				'default_value' => $default_settings['caption_threshold'],
-				'description'   => __( 'Minimum confidence score for automatically applied image captions, numeric value from 0-100. Recommended to be set to at least 75.', 'classifai' ),
+				'description'   => __( 'Minimum confidence score for automatically added alt text, numeric value from 0-100. Recommended to be set to at least 75.', 'classifai' ),
 			]
 		);
 		add_settings_field(
 			'enable-image-tagging',
-			esc_html__( 'Automatically Tag Images', 'classifai' ),
+			esc_html__( 'Tag images', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -799,12 +799,12 @@ public function setup_fields_sections() {
 				'label_for'     => 'enable_image_tagging',
 				'input_type'    => 'checkbox',
 				'default_value' => $default_settings['enable_image_tagging'],
-				'description'   => __( 'Images will be tagged upon upload', 'classifai' ),
+				'description'   => __( 'Image tags will be added automatically.', 'classifai' ),
 			]
 		);
 		add_settings_field(
 			'image-tag-threshold',
-			esc_html__( 'Tag Confidence Threshold', 'classifai' ),
+			esc_html__( 'Tag confidence threshold', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -812,7 +812,7 @@ public function setup_fields_sections() {
 				'label_for'     => 'tag_threshold',
 				'input_type'    => 'number',
 				'default_value' => $default_settings['tag_threshold'],
-				'description'   => __( 'Minimum confidence score for automatically applied image tags, numeric value from 0-100. Recommended to be set to at least 70.', 'classifai' ),
+				'description'   => __( 'Minimum confidence score for automatically added image tags, numeric value from 0-100. Recommended to be set to at least 70.', 'classifai' ),
 			]
 		);
 		// What taxonomy should we tag images with?
@@ -823,7 +823,7 @@ public function setup_fields_sections() {
 		}
 		add_settings_field(
 			'image-tag-taxonomy',
-			esc_html__( 'Tag Taxonomy', 'classifai' ),
+			esc_html__( 'Tag taxonomy', 'classifai' ),
 			[ $this, 'render_select' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -844,14 +844,14 @@ public function setup_fields_sections() {
 				'input_type'    => 'checkbox',
 				'default_value' => $default_settings['enable_smart_cropping'],
 				'description'   => __(
-					'Crop images around a region of interest identified by ComputerVision',
+					'ComputerVision detects and saves the most visually interesting part of your image (i.e., faces, animals, notable text).',
 					'classifai'
 				),
 			]
 		);
 		add_settings_field(
 			'enable-ocr',
-			esc_html__( 'Enable OCR', 'classifai' ),
+			esc_html__( 'Scan images for text', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
@@ -860,14 +860,14 @@ public function setup_fields_sections() {
 				'input_type'    => 'checkbox',
 				'default_value' => $default_settings['enable_ocr'],
 				'description'   => __(
-					'Detect text in an image and store that as post content',
+					'OCR detects text in images (e.g., handwritten notes) and saves that as post content.',
 					'classifai'
 				),
 			]
 		);
 		add_settings_field(
 			'enable-read-pdf',
-			esc_html__( 'Enable Scanning PDF', 'classifai' ),
+			esc_html__( 'Enable scanning PDF', 'classifai' ),
 			[ $this, 'render_input' ],
 			$this->get_option_name(),
 			$this->get_option_name(),
diff --git a/includes/Classifai/Services/ImageProcessing.php b/includes/Classifai/Services/ImageProcessing.php
index b00868586..8898ce3e0 100644
--- a/includes/Classifai/Services/ImageProcessing.php
+++ b/includes/Classifai/Services/ImageProcessing.php
@@ -52,8 +52,8 @@ public function add_rescan_button_to_media_modal( $form_fields, $post ) {
 		$settings = get_option( 'classifai_computer_vision' );
 
 		if ( attachment_is_pdf( $post ) && $settings && isset( $settings['enable_read_pdf'] ) && '1' === $settings['enable_read_pdf'] ) {
-			$read_text   = empty( get_the_content( null, false, $post ) ) ? __( 'Scan', 'classifai' ) : __( 'Rescan', 'classifai' );
-			$status = get_post_meta( $post->ID, '_classifai_azure_read_status', true );
+			$read_text = empty( get_the_content( null, false, $post ) ) ? __( 'Scan', 'classifai' ) : __( 'Rescan', 'classifai' );
+			$status    = get_post_meta( $post->ID, '_classifai_azure_read_status', true );
 			if ( ! empty( $status['status'] ) && 'running' === $status['status'] ) {
 				$html = '<button class="button secondary" disabled>' . esc_html__( 'In progress!', 'classifai' ) . '</button>';
 			} else {
@@ -61,7 +61,7 @@ public function add_rescan_button_to_media_modal( $form_fields, $post ) {
 			}
 
 			$form_fields['rescan_pdf'] = [
-				'label'        => __( 'Classifai Read PDF', 'classifai' ),
+				'label'        => __( 'Scan PDF for text', 'classifai' ),
 				'input'        => 'html',
 				'html'         => $html,
 				'show_in_edit' => false,
@@ -71,17 +71,18 @@ public function add_rescan_button_to_media_modal( $form_fields, $post ) {
 		if ( wp_attachment_is_image( $post ) ) {
 			$alt_tags_text   = empty( get_post_meta( $post->ID, '_wp_attachment_image_alt', true ) ) ? __( 'Generate', 'classifai' ) : __( 'Rescan', 'classifai' );
 			$image_tags_text = empty( wp_get_object_terms( $post->ID, 'classifai-image-tags' ) ) ? __( 'Generate', 'classifai' ) : __( 'Rescan', 'classifai' );
-			$ocr_text        = empty( get_post_meta( $post->ID, 'classifai_computer_vision_ocr', true ) ) ? __( 'Generate', 'classifai' ) : __( 'Rescan', 'classifai' );
+			$ocr_text        = empty( get_post_meta( $post->ID, 'classifai_computer_vision_ocr', true ) ) ? __( 'Scan', 'classifai' ) : __( 'Rescan', 'classifai' );
 			$smart_crop_text = empty( get_transient( 'classifai_azure_computer_vision_smart_cropping_latest_response' ) ) ? __( 'Generate', 'classifai' ) : __( 'Regenerate', 'classifai' );
 
 			$form_fields['rescan_alt_tags'] = [
-				'label'        => __( 'Classifai Alt Tags', 'classifai' ),
+				'label'        => __( 'Alt text', 'classifai' ),
 				'input'        => 'html',
 				'html'         => '<button class="button secondary" id="classifai-rescan-alt-tags" data-id="' . esc_attr( absint( $post->ID ) ) . '">' . esc_html( $alt_tags_text ) . '</button><span class="spinner" style="display:none;float:none;"></span><span class="error" style="display:none;color:#bc0b0b;padding:5px;"></span>',
 				'show_in_edit' => false,
 			];
+
 			$form_fields['rescan_captions'] = [
-				'label'        => __( 'Classifai Image Tags', 'classifai' ),
+				'label'        => __( 'Image tags', 'classifai' ),
 				'input'        => 'html',
 				'html'         => '<button class="button secondary" id="classifai-rescan-image-tags" data-id="' . esc_attr( absint( $post->ID ) ) . '">' . esc_html( $image_tags_text ) . '</button><span class="spinner" style="display:none;float:none;"></span><span class="error" style="display:none;color:#bc0b0b;padding:5px;"></span>',
 				'show_in_edit' => false,
@@ -89,7 +90,7 @@ public function add_rescan_button_to_media_modal( $form_fields, $post ) {
 
 			if ( $settings && isset( $settings['enable_smart_cropping'] ) && '1' === $settings['enable_smart_cropping'] ) {
 				$form_fields['rescan_smart_crop'] = [
-					'label'        => __( 'Classifai Smart Crop', 'classifai' ),
+					'label'        => __( 'Smart thumbnail', 'classifai' ),
 					'input'        => 'html',
 					'html'         => '<button class="button secondary" id="classifai-rescan-smart-crop" data-id="' . esc_attr( absint( $post->ID ) ) . '">' . esc_html( $smart_crop_text ) . '</button><span class="spinner" style="display:none;float:none;"></span><span class="error" style="display:none;color:#bc0b0b;padding:5px;"></span>',
 					'show_in_edit' => false,
@@ -97,7 +98,7 @@ public function add_rescan_button_to_media_modal( $form_fields, $post ) {
 			}
 
 			$form_fields['rescan_ocr'] = [
-				'label'        => __( 'Detect Text', 'classifai' ),
+				'label'        => __( 'Scan image for text', 'classifai' ),
 				'input'        => 'html',
 				'html'         => '<button class="button secondary" id="classifai-rescan-ocr" data-id="' . esc_attr( absint( $post->ID ) ) . '">' . esc_html( $ocr_text ) . '</button><span class="spinner" style="display:none;float:none;"></span><span class="error" style="display:none;color:#bc0b0b;padding:5px;"></span>',
 				'show_in_edit' => false,
diff --git a/languages/classifai.pot b/languages/classifai.pot
index eaeb3921e..4355a3fb5 100644
--- a/languages/classifai.pot
+++ b/languages/classifai.pot
@@ -1,14 +1,14 @@
-# Copyright (C) 2021 10up
+# Copyright (C) 2022 10up
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
 "Project-Id-Version: ClassifAI 1.7.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/classifai\n"
-"POT-Creation-Date: 2021-08-26 23:15:21+00:00\n"
+"POT-Creation-Date: 2022-02-16 00:06:04+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2021-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2022-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "X-Generator: node-wp-i18n 1.2.3\n"
@@ -42,11 +42,11 @@ msgid ""
 msgstr ""
 
 #: includes/Classifai/Admin/BulkActions.php:58
-#: includes/Classifai/Admin/BulkActions.php:127
+#: includes/Classifai/Admin/BulkActions.php:134
 msgid "Classify"
 msgstr ""
 
-#: includes/Classifai/Admin/BulkActions.php:94
+#: includes/Classifai/Admin/BulkActions.php:95
 msgid "Classified %s post."
 msgid_plural "Classified %s posts."
 msgstr[0] ""
@@ -67,18 +67,6 @@ msgstr ""
 msgid "ClassifAI requires setup"
 msgstr ""
 
-#: includes/Classifai/Providers/AWS/Comprehend.php:50
-#: includes/Classifai/Providers/Azure/ComputerVision.php:743
-msgid "Endpoint URL"
-msgstr ""
-
-#: includes/Classifai/Providers/AWS/Comprehend.php:61
-#: includes/Classifai/Providers/Azure/ComputerVision.php:756
-#: includes/Classifai/Providers/Watson/NLU.php:196
-#: includes/Classifai/Providers/Watson/NLU.php:270
-msgid "API Key"
-msgstr ""
-
 #: includes/Classifai/Providers/Azure/ComputerVision.php:212
 msgid "ClassifAI Image Processing"
 msgstr ""
@@ -88,43 +76,46 @@ msgid "ClassifAI PDF Processing"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:239
-msgid "Rescan Alt Text"
+msgid "No alt text? Rescan image"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:239
-msgid "Scan Alt Text"
+#: includes/Classifai/Providers/Azure/ComputerVision.php:768
+msgid "Generate alt text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:240
-msgid "Rescan Tags"
+msgid "Rescan image for new tags"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:240
-msgid "Generate Tags"
+msgid "Generate image tags"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:241
-msgid "Rescan Text"
+msgid "Rescan for text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:241
-msgid "Scan Text"
+#: includes/Classifai/Services/ImageProcessing.php:101
+msgid "Scan image for text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:242
-msgid "Regenerate Smart Thumbnail"
+msgid "Regenerate smart thumbnail"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:242
-msgid "Generate Smart Thumbnail"
+msgid "Create smart thumbnail"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:283
-msgid "Scan PDF content"
+#: includes/Classifai/Services/ImageProcessing.php:64
+msgid "Scan PDF for text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:283
-msgid "Rescan PDF content"
+msgid "Rescan PDF for text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:297
@@ -132,48 +123,58 @@ msgstr ""
 msgid "In progress!"
 msgstr ""
 
+#: includes/Classifai/Providers/Azure/ComputerVision.php:743
+msgid "Endpoint URL"
+msgstr ""
+
 #: includes/Classifai/Providers/Azure/ComputerVision.php:751
-msgid "e.g. <code>https://REGION.api.cognitive.microsoft.com/</code>"
+msgid ""
+"Supported protocol and hostname endpoints, e.g., "
+"<code>https://REGION.api.cognitive.microsoft.com</code> or "
+"<code>https://EXAMPLE.cognitiveservices.azure.com</code>. This can look "
+"different based on your setting choices in Azure."
 msgstr ""
 
-#: includes/Classifai/Providers/Azure/ComputerVision.php:768
-msgid "Automatically Caption Images"
+#: includes/Classifai/Providers/Azure/ComputerVision.php:756
+#: includes/Classifai/Providers/Watson/NLU.php:200
+#: includes/Classifai/Providers/Watson/NLU.php:295
+msgid "API Key"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:776
-msgid "Images will be captioned with alt text upon upload"
+msgid "The alt text field will be filled out automatically."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:781
-msgid "Caption Confidence Threshold"
+msgid "Alt text confidence threshold"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:789
 msgid ""
-"Minimum confidence score for automatically applied image captions, numeric "
-"value from 0-100. Recommended to be set to at least 75."
+"Minimum confidence score for automatically added alt text, numeric value "
+"from 0-100. Recommended to be set to at least 75."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:794
-msgid "Automatically Tag Images"
+msgid "Tag images"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:802
-msgid "Images will be tagged upon upload"
+msgid "Image tags will be added automatically."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:807
-msgid "Tag Confidence Threshold"
+msgid "Tag confidence threshold"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:815
 msgid ""
-"Minimum confidence score for automatically applied image tags, numeric "
-"value from 0-100. Recommended to be set to at least 70."
+"Minimum confidence score for automatically added image tags, numeric value "
+"from 0-100. Recommended to be set to at least 70."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:826
-msgid "Tag Taxonomy"
+msgid "Tag taxonomy"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:838
@@ -181,19 +182,23 @@ msgid "Enable smart cropping"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:846
-msgid "Crop images around a region of interest identified by ComputerVision"
+msgid ""
+"ComputerVision detects and saves the most visually interesting part of your "
+"image (i.e., faces, animals, notable text)."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:854
-msgid "Enable OCR"
+msgid "Scan image or PDF for text"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:862
-msgid "Detect text in an image and store that as post content"
+msgid ""
+"OCR detects text in images (i.e., handwritten notes) or PDF files and saves "
+"that as post content."
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:870
-msgid "Enable Scanning PDF"
+msgid "Enable scanning PDF"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:878
@@ -211,20 +216,20 @@ msgid "Authenticated"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:1014
-#: includes/Classifai/Providers/Watson/NLU.php:662
-#: includes/Classifai/Services/ServicesManager.php:364
+#: includes/Classifai/Providers/Watson/NLU.php:700
+#: includes/Classifai/Services/ServicesManager.php:354
 msgid "yes"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:1014
-#: includes/Classifai/Providers/Watson/NLU.php:662
-#: includes/Classifai/Services/ServicesManager.php:364
+#: includes/Classifai/Providers/Watson/NLU.php:700
+#: includes/Classifai/Services/ServicesManager.php:354
 msgid "no"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:1015
-#: includes/Classifai/Providers/Watson/NLU.php:242
-#: includes/Classifai/Providers/Watson/NLU.php:663
+#: includes/Classifai/Providers/Watson/NLU.php:267
+#: includes/Classifai/Providers/Watson/NLU.php:701
 msgid "API URL"
 msgstr ""
 
@@ -245,7 +250,7 @@ msgid "Latest response - OCR"
 msgstr ""
 
 #: includes/Classifai/Providers/Azure/ComputerVision.php:1032
-#: includes/Classifai/Providers/Watson/NLU.php:680
+#: includes/Classifai/Providers/Watson/NLU.php:718
 msgid "N/A"
 msgstr ""
 
@@ -285,19 +290,19 @@ msgstr ""
 msgid "Unknown Read error."
 msgstr ""
 
-#: includes/Classifai/Providers/Azure/Read.php:227
+#: includes/Classifai/Providers/Azure/Read.php:228
 msgid "Invalid Read result."
 msgstr ""
 
-#: includes/Classifai/Providers/Azure/Read.php:238
+#: includes/Classifai/Providers/Azure/Read.php:239
 msgid "The Read operation has failed."
 msgstr ""
 
-#: includes/Classifai/Providers/Azure/Read.php:244
+#: includes/Classifai/Providers/Azure/Read.php:245
 msgid "Invalid Read result status."
 msgstr ""
 
-#: includes/Classifai/Providers/Azure/Read.php:259
+#: includes/Classifai/Providers/Azure/Read.php:260
 msgid "The Read result is invalid."
 msgstr ""
 
@@ -305,69 +310,69 @@ msgstr ""
 msgid "Please Choose"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:40
+#: includes/Classifai/Providers/Watson/NLU.php:41
 msgid "Category"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:41
+#: includes/Classifai/Providers/Watson/NLU.php:42
 msgid "Category Threshold (%)"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:42
+#: includes/Classifai/Providers/Watson/NLU.php:43
 msgid "Category Taxonomy"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:47
+#: includes/Classifai/Providers/Watson/NLU.php:48
 msgid "Keyword"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:48
+#: includes/Classifai/Providers/Watson/NLU.php:49
 msgid "Keyword Threshold (%)"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:49
+#: includes/Classifai/Providers/Watson/NLU.php:50
 msgid "Keyword Taxonomy"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:54
+#: includes/Classifai/Providers/Watson/NLU.php:55
 msgid "Entity"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:55
+#: includes/Classifai/Providers/Watson/NLU.php:56
 msgid "Entity Threshold (%)"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:56
+#: includes/Classifai/Providers/Watson/NLU.php:57
 msgid "Entity Taxonomy"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:61
+#: includes/Classifai/Providers/Watson/NLU.php:62
 msgid "Concept"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:62
+#: includes/Classifai/Providers/Watson/NLU.php:63
 msgid "Concept Threshold (%)"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:63
+#: includes/Classifai/Providers/Watson/NLU.php:64
 msgid "Concept Taxonomy"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:195
+#: includes/Classifai/Providers/Watson/NLU.php:199
 msgid "API Password"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:197
-#: includes/Classifai/Providers/Watson/NLU.php:289
+#: includes/Classifai/Providers/Watson/NLU.php:201
+#: includes/Classifai/Providers/Watson/NLU.php:314
 msgid "Use an API Key instead?"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:198
-#: includes/Classifai/Providers/Watson/NLU.php:288
+#: includes/Classifai/Providers/Watson/NLU.php:202
+#: includes/Classifai/Providers/Watson/NLU.php:313
 msgid "Use a username/password instead?"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:214
+#: includes/Classifai/Providers/Watson/NLU.php:218
 msgid ""
 "Don't have an IBM Cloud account yet? <a title=\"Register for an IBM Cloud "
 "account\" href=\"%1$s\">Register for one</a> and set up a <a "
@@ -375,47 +380,59 @@ msgid ""
 "key."
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:255
+#: includes/Classifai/Providers/Watson/NLU.php:237
+msgid ""
+"The `watsonplatform.net` endpoint URLs were retired on 26 May 2021. Please "
+"update the endpoint url. Check <a title=\"Deprecated Endpoint: "
+"watsonplatform.net\" href=\"%s\">here</a> for details."
+msgstr ""
+
+#: includes/Classifai/Providers/Watson/NLU.php:280
 msgid "API Username"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:318
+#: includes/Classifai/Providers/Watson/NLU.php:343
 msgid "Post Types to Classify"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:442
+#: includes/Classifai/Providers/Watson/NLU.php:354
+msgid "Post Statuses to Classify"
+msgstr ""
+
+#: includes/Classifai/Providers/Watson/NLU.php:505
 msgid "Watson Category Settings"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:447
+#: includes/Classifai/Providers/Watson/NLU.php:510
 msgid "Enable"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:551
+#: includes/Classifai/Providers/Watson/NLU.php:614
 msgid "IBM Watson NLU Authentication Failed. Please check credentials."
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:662
+#: includes/Classifai/Providers/Watson/NLU.php:700
 msgid "Configured"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:664
+#: includes/Classifai/Providers/Watson/NLU.php:702
 msgid "API username"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:665
+#: includes/Classifai/Providers/Watson/NLU.php:703
 msgid "Post types"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:666
+#: includes/Classifai/Providers/Watson/NLU.php:704
 msgid "Features"
 msgstr ""
 
-#: includes/Classifai/Providers/Watson/NLU.php:667
+#: includes/Classifai/Providers/Watson/NLU.php:705
 msgid "Latest response"
 msgstr ""
 
 #: includes/Classifai/Services/ImageProcessing.php:55
+#: includes/Classifai/Services/ImageProcessing.php:74
 msgid "Scan"
 msgstr ""
 
@@ -426,13 +443,8 @@ msgstr ""
 msgid "Rescan"
 msgstr ""
 
-#: includes/Classifai/Services/ImageProcessing.php:64
-msgid "Classifai Read PDF"
-msgstr ""
-
 #: includes/Classifai/Services/ImageProcessing.php:72
 #: includes/Classifai/Services/ImageProcessing.php:73
-#: includes/Classifai/Services/ImageProcessing.php:74
 #: includes/Classifai/Services/ImageProcessing.php:75
 msgid "Generate"
 msgstr ""
@@ -442,38 +454,34 @@ msgid "Regenerate"
 msgstr ""
 
 #: includes/Classifai/Services/ImageProcessing.php:78
-msgid "Classifai Alt Tags"
-msgstr ""
-
-#: includes/Classifai/Services/ImageProcessing.php:84
-msgid "Classifai Image Tags"
+msgid "Alt text"
 msgstr ""
 
-#: includes/Classifai/Services/ImageProcessing.php:92
-msgid "Classifai Smart Crop"
+#: includes/Classifai/Services/ImageProcessing.php:85
+msgid "Image tags"
 msgstr ""
 
-#: includes/Classifai/Services/ImageProcessing.php:100
-msgid "Detect Text"
+#: includes/Classifai/Services/ImageProcessing.php:93
+msgid "Smart thumbnail"
 msgstr ""
 
 #: includes/Classifai/Services/LanguageProcessing.php:14
 msgid "Language Processing"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:144
+#: includes/Classifai/Services/ServicesManager.php:134
 msgid "Invalid ClassifAI registration info. Please check and try again."
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:160
+#: includes/Classifai/Services/ServicesManager.php:150
 msgid "Registered Email"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:173
+#: includes/Classifai/Services/ServicesManager.php:163
 msgid "Registration Key"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:181
+#: includes/Classifai/Services/ServicesManager.php:171
 msgid ""
 "Registration is 100% free and provides update notifications and upgrades "
 "inside the dashboard.<br /><a "
@@ -484,16 +492,16 @@ msgstr ""
 msgid "ClassifAI"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:229
+#: includes/Classifai/Services/ServicesManager.php:219
 #. Translators: Main title.
 msgid "ClassifAI %s"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:366
+#: includes/Classifai/Services/ServicesManager.php:356
 msgid "Valid license"
 msgstr ""
 
-#: includes/Classifai/Services/ServicesManager.php:371
+#: includes/Classifai/Services/ServicesManager.php:361
 msgid "Email"
 msgstr ""
 
diff --git a/tests/e2e/wpacceptance/ImageProcessing.php b/tests/e2e/wpacceptance/ImageProcessing.php
index 36909b1a4..c470c9e41 100644
--- a/tests/e2e/wpacceptance/ImageProcessing.php
+++ b/tests/e2e/wpacceptance/ImageProcessing.php
@@ -45,9 +45,9 @@ public function testGenerateCheckboxesShows() {
 
 		$I->seeText( 'ClassifAI Image Processing' );
 
-		$I->seeText( 'Scan Alt Text' );
+		$I->seeText( 'Generate alt text' );
 
-		$I->seeText( 'Generate Tags' );
+		$I->seeText( 'Generate image tags' );
 	}
 
 	/**
@@ -62,6 +62,6 @@ public function testRescanCheckboxesShows() {
 
 		$I->seeText( 'ClassifAI Image Processing' );
 
-		$I->seeText( 'Rescan Alt Text' );
+		$I->seeText( 'No alt text? Rescan image' );
 	}
 }
diff --git a/tests/e2e/wpacceptance/Settings.php b/tests/e2e/wpacceptance/Settings.php
index df1962744..4e9390fca 100644
--- a/tests/e2e/wpacceptance/Settings.php
+++ b/tests/e2e/wpacceptance/Settings.php
@@ -117,7 +117,7 @@ public function testComputerVisionSettingsShows() {
 
 		$I->seeText( 'Computer Vision' );
 
-		$I->seeText( 'Automatically Caption Images' );
+		$I->seeText( 'Generate alt text' );
 	}
 }