diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.ini
index 1606b03..77b0c66 100644
--- a/src/administrator/language/en-GB/en-GB.com_weblinks.ini
+++ b/src/administrator/language/en-GB/en-GB.com_weblinks.ini
@@ -3,7 +3,7 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-COM_WEBLINKS="Weblinks"
+COM_WEBLINKS="Web Links"
 COM_WEBLINKS_ACCESS_HEADING="Access"
 COM_WEBLINKS_BATCH_OPTIONS="Batch process the selected links"
 COM_WEBLINKS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved links. Otherwise, all actions are applied to the selected links."
diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
index 422a292..f3224f8 100644
--- a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
+++ b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
@@ -3,7 +3,7 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-COM_WEBLINKS="Weblinks"
+COM_WEBLINKS="Web Links"
 COM_WEBLINKS_CATEGORIES="Categories"
 COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_DESC="Show all the web link categories within a category."
 COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_OPTION="Default"
diff --git a/src/language/en-GB/en-GB.mod_weblinks.ini b/src/language/en-GB/en-GB.mod_weblinks.ini
index c45906c..6e5588a 100644
--- a/src/language/en-GB/en-GB.mod_weblinks.ini
+++ b/src/language/en-GB/en-GB.mod_weblinks.ini
@@ -3,7 +3,7 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
-MOD_WEBLINKS="Weblinks"
+MOD_WEBLINKS="Web Links"
 MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display."
 MOD_WEBLINKS_FIELD_COUNT_DESC="Number of Web Links to display."
 MOD_WEBLINKS_FIELD_COUNT_LABEL="Count"
diff --git a/src/language/en-GB/en-GB.pkg_weblinks.sys.ini b/src/language/en-GB/en-GB.pkg_weblinks.sys.ini
index c82708d..280b929 100644
--- a/src/language/en-GB/en-GB.pkg_weblinks.sys.ini
+++ b/src/language/en-GB/en-GB.pkg_weblinks.sys.ini
@@ -3,5 +3,5 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-PKG_WEBLINKS="Weblinks Extension Package"
-PKG_WEBLINKS_XML_DESCRIPTION="The Weblinks package includes the weblinks component, module, and search plugins for both of Joomla's search platforms."
+PKG_WEBLINKS="Web Links Extension Package"
+PKG_WEBLINKS_XML_DESCRIPTION="The Web Links package includes the Web Links component, module, and search plugins for both of Joomla's search platforms."
diff --git a/src/pkg_weblinks.xml b/src/pkg_weblinks.xml
index e1d6700..51b6265 100644
--- a/src/pkg_weblinks.xml
+++ b/src/pkg_weblinks.xml
@@ -25,6 +25,6 @@
 	</languages>
 	<updateservers>
 		<!-- Note: No spaces or linebreaks allowed between the server tags -->
-		<server type="extension" name="Weblinks Update Site">https://raw.githubusercontent.com/joomla-extensions/weblinks/master/manifest.xml</server>
+		<server type="extension" name="Web Links Update Site">https://raw.githubusercontent.com/joomla-extensions/weblinks/master/manifest.xml</server>
 	</updateservers>
 </extension>
diff --git a/tests/acceptance/administrator/AdministratorCategoriesCest.php b/tests/acceptance/administrator/AdministratorCategoriesCest.php
index 4857fd9..9d583ff 100644
--- a/tests/acceptance/administrator/AdministratorCategoriesCest.php
+++ b/tests/acceptance/administrator/AdministratorCategoriesCest.php
@@ -32,12 +32,12 @@ class AdministratorCategoriesCest
 
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->expectTo('see categories page');
 
 		$I->amGoingTo('try to save a category with empty title and it should fail');
 		$I->clickToolbarButton('new');
-		$I->waitForText('Weblinks: New Category', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: New Category', '60', ['css' => 'h1']);
 		$I->clickToolbarButton('save');
 		$I->expectTo('see an error when trying to save a category without title');
 		$I->see('Invalid field:  Title', ['id' => 'system-message-container']);
@@ -52,13 +52,13 @@ class AdministratorCategoriesCest
 
 		$I->amGoingTo('Navigate to Categories page in /administrator/ and create a Category');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->expectTo('see categories page');
 		$I->checkForPhpNoticesOrWarnings();
 
 		$I->amGoingTo('try to save a category with a filled title');
 		$I->clickToolbarButton('New');
-		$I->waitForText('Weblinks: New Category', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: New Category', '60', ['css' => 'h1']);
 		$I->fillField(['id' => 'jform_title'], $this->categoryTitle);
 		$I->clickToolbarButton('Save & Close');
 		$I->expectTo('see a success message after saving the category');
@@ -78,9 +78,9 @@ class AdministratorCategoriesCest
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
 		$I->searchForItem($this->categoryTitle);
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->checkAllResults();
-		$I->amGoingTo('try to publish a Weblinks Category');
+		$I->amGoingTo('try to publish a Web Links Category');
 		$I->clickToolbarButton('publish');
 		$I->waitForElement(['id' => 'system-message-container'], '60');
 		$I->expectTo('see a success message after publishing the category');
@@ -98,10 +98,10 @@ class AdministratorCategoriesCest
 		$I->doAdministratorLogin();
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->searchForItem($this->categoryTitle);
 		$I->checkAllResults();
-		$I->amGoingTo('try to unpublish a Weblinks Category');
+		$I->amGoingTo('try to unpublish a Web Links Category');
 		$I->clickToolbarButton('unpublish');
 		$I->waitForElement(['id' => 'system-message-container'], '60');
 		$I->expectTo('See a success message after unpublishing the category');
@@ -119,10 +119,10 @@ class AdministratorCategoriesCest
 		$I->doAdministratorLogin();
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->searchForItem($this->categoryTitle);
 		$I->checkAllResults();
-		$I->amGoingTo('try to archive a weblink category');
+		$I->amGoingTo('try to archive a Web Links category');
 		$I->clickToolbarButton('archive');
 		$I->waitForElement(['id' => 'system-message-container'], '60');
 		$I->expectTo('see a success message after Archiving the category');
@@ -140,11 +140,11 @@ class AdministratorCategoriesCest
 		$I->doAdministratorLogin();
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->setFilter('Select Status', 'Archived');
 		$I->searchForItem($this->categoryTitle);
 		$I->checkAllResults();
-		$I->amGoingTo('try to delete a Weblinks Category');
+		$I->amGoingTo('try to delete a Web Links Category');
 		$I->clickToolbarButton('Trash');
 		$I->waitForElement(['id' => 'system-message-container'], '60');
 		$I->expectTo('see a success message after Trashing the category');
@@ -162,11 +162,11 @@ class AdministratorCategoriesCest
 		$I->doAdministratorLogin();
 		$I->amGoingTo('Navigate to Categories page in /administrator/');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
-		$I->waitForText('Weblinks: Categories', '60', ['css' => 'h1']);
+		$I->waitForText('Web Links: Categories', '60', ['css' => 'h1']);
 		$I->setFilter('Select Status', 'Trashed');
 		$I->searchForItem($this->categoryTitle);
 		$I->checkAllResults();
-		$I->amGoingTo('try to delete a Weblinks Category');
+		$I->amGoingTo('try to delete a Web Links Category');
 		$I->clickToolbarButton('Empty trash');
 		$I->acceptPopup();
 		$I->waitForElement(['id' => 'system-message-container'], '60');
@@ -184,7 +184,7 @@ class AdministratorCategoriesCest
 		$I->amGoingTo('Navigate to Categories page in /administrator/ and verify the Tabs');
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
 		$I->clickToolbarButton('New');
-		$I->waitForText('Weblinks: New Category', '30', ['css' => 'h1']);
+		$I->waitForText('Web Links: New Category', '30', ['css' => 'h1']);
 		$I->verifyAvailableTabs(['Category', 'Publishing', 'Permissions', 'Options']);
 	}
 }
diff --git a/tests/acceptance/frontend/FrontendWeblinksCest.php b/tests/acceptance/frontend/FrontendWeblinksCest.php
index e8ceb1c..46c48aa 100644
--- a/tests/acceptance/frontend/FrontendWeblinksCest.php
+++ b/tests/acceptance/frontend/FrontendWeblinksCest.php
@@ -28,26 +28,26 @@ class FrontendWeblinksCest
 	public function createWeblinkAndConfirmFrontend(\Step\Acceptance\weblink $I)
 	{
 		$I->am('Administrator');
-		$I->wantToTest('Listing a category of Weblinks in frontend');
+		$I->wantToTest('Listing a category of Web Links in frontend');
 
 		$I->doAdministratorLogin();
 
 		$I->createWeblink($this->title, $this->url, "No");
 
 		// Menu link
-		$I->createMenuItem($this->menuItem, 'Weblinks', 'List All Web Link Categories', 'Main Menu');
+		$I->createMenuItem($this->menuItem, 'Web Links', 'List All Web Link Categories', 'Main Menu');
 
 		// Go to the frontend
 		$I->comment('I want to check if the menu entry exists in the frontend');
 		$I->amOnPage('index.php?option=com_weblinks');
-		$I->expectTo('see weblink categories');
+		$I->expectTo('see web link categories');
 		$I->waitForText('Uncategorised','30', ['css' => 'h3']);
 		$I->checkForPhpNoticesOrWarnings();
-		$I->comment('I open the uncategorised Weblink Category');
+		$I->comment('I open the uncategorised Web link Category');
 		$I->click(['link' => 'Uncategorised']);
 
 		$I->waitForText('Uncategorised','30', ['css' => 'h2']);
-		$I->expectTo('see the weblink we created');
+		$I->expectTo('see the web link we created');
 		$I->seeElement(['link' => $this->title]);
 		$I->seeElement(['xpath' => "//a[@href='$this->url']"]);
 	}
@@ -66,16 +66,16 @@ class FrontendWeblinksCest
 
 		// Go to the frontend
 		$I->amOnPage('index.php?option=com_weblinks');
-		$I->expectTo('see weblink categories');
+		$I->expectTo('see web link categories');
 		$I->waitForText('Uncategorised','30', ['css' => 'h3']);
 		$I->checkForPhpNoticesOrWarnings();
-		$I->comment('I open the uncategorised Weblink Category');
+		$I->comment('I open the uncategorised Web Link Category');
 		$I->waitForElement(['link' => 'Uncategorised'], 60);
 		$I->click(['link' => 'Uncategorised']);
 
 		// Check that hits is 0
 		$I->waitForText('Uncategorised','30', ['css' => 'h2']);
-		$I->expectTo('see the weblink we created');
+		$I->expectTo('see the web link we created');
 		$I->seeElement(['link' => $title]);
 		$I->expectTo('see that hits is 0');
 		$I->see('Hits: 0', ['class' => 'list-hits']);
@@ -86,7 +86,7 @@ class FrontendWeblinksCest
 		$I->amOnPage('index.php?option=com_weblinks');
 		$I->waitForElement(['link' => 'Uncategorised'], 60);
 		$I->click(['link' => 'Uncategorised']);
-		$I->comment('I search the weblink: ' . $title);
+		$I->comment('I search the web link: ' . $title);
 		$I->waitForElement(['id' => 'filter-search'], 60);
 		$I->fillField(['id' => 'filter-search'], $title);
 		$I->pressKey(['id' => 'filter-search'], \Facebook\WebDriver\WebDriverKeys::ENTER);
@@ -111,15 +111,15 @@ class FrontendWeblinksCest
 
 		// Go to the frontend
 		$I->amOnPage('index.php?option=com_weblinks');
-		$I->expectTo('see weblink categories');
+		$I->expectTo('see web link categories');
 		$I->waitForText('Uncategorised','30', ['css' => 'h3']);
 		$I->checkForPhpNoticesOrWarnings();
-		$I->comment('I open the uncategorised Weblink Category');
+		$I->comment('I open the uncategorised Web Link Category');
 		$I->click(['link' => 'Uncategorised']);
 
 		// Check that hits is 0
 		$I->waitForText('Uncategorised','30', ['css' => 'h2']);
-		$I->expectTo('see the weblink we created');
+		$I->expectTo('see the web link we created');
 		$I->seeElement(['link' => $title]);
 		$I->expectTo('see that hits is 0');
 		$I->see('Hits: 0', ['class' => 'list-hits']);
@@ -127,10 +127,10 @@ class FrontendWeblinksCest
 		// Click on the link, go back, and check that hits is 1
 		$I->click(['link' => $title]);
 		$I->amOnPage('index.php?option=com_weblinks');
-		$I->comment('I open the uncategorised Weblink Category');
+		$I->comment('I open the uncategorised Web Link Category');
 		$I->waitForElement(['link' => 'Uncategorised'], 60);
 		$I->click(['link' => 'Uncategorised']);
-		$I->comment('I search the weblink: ' . $title);
+		$I->comment('I search the web link: ' . $title);
 		$I->waitForElement(['id' => 'filter-search'], 60);
 		$I->fillField(['id' => 'filter-search'], $title);
 		$I->pressKey(['id' => 'filter-search'], \Facebook\WebDriver\WebDriverKeys::ENTER);