Repository: robotframework/SeleniumLibrary
Pull request #871 (2017-08-25 09:17:54)

Selenium2Library -> SeleniumLibrary


Patch:
diff --git a/setup.py b/setup.py
index 8672af97..88c605d7 100755
--- a/setup.py
+++ b/setup.py
@@ -7,26 +7,26 @@ from setuptools import setup
 
 CURDIR = dirname(abspath(__file__))
 
-with open(join(CURDIR, 'src', 'Selenium2Library', '__init__.py')) as f:
+with open(join(CURDIR, 'src', 'SeleniumLibrary', '__init__.py')) as f:
     VERSION = re.search("\n__version__ = '(.*)'\n", f.read()).group(1)
 
 DESCRIPTION = """
-Selenium2Library is a web testing library for Robot Framework
-that leverages the Selenium 2 (WebDriver) libraries.
+SeleniumLibrary is a web testing library for Robot Framework
+that utilizes the Selenium tool internally.
 """[1:-1]
 
 with open(join(CURDIR, 'requirements.txt')) as f:
     REQUIREMENTS = f.read().splitlines()
 
-setup(name         = 'robotframework-selenium2library',
+setup(name         = 'robotframework-seleniumlibrary',
       version      = VERSION,
       description  = 'Web testing library for Robot Framework',
       long_description = DESCRIPTION,
       author       = 'Ryan Tomac , Ed Manlove , Jeremy Johnson',
       author_email = '<ryan@tomacfamily.com> ,  <devPyPlTw@verizon.net> ,  <jeremy@softworks.com.my>',
-      url          = 'https://github.com/robotframework/Selenium2Library',
+      url          = 'https://github.com/robotframework/SeleniumLibrary',
       license      = 'Apache License 2.0',
-      keywords     = 'robotframework testing testautomation selenium selenium2 webdriver web',
+      keywords     = 'robotframework testing testautomation selenium webdriver web',
       platforms    = 'any',
       classifiers  = [
                         "Development Status :: 5 - Production/Stable",
@@ -40,7 +40,7 @@ setup(name         = 'robotframework-selenium2library',
                      ],
       install_requires = REQUIREMENTS,
       package_dir  = {'' : 'src'},
-      packages     = ['Selenium2Library','Selenium2Library.keywords','Selenium2Library.locators',
-                      'Selenium2Library.utils'],
+      packages     = ['SeleniumLibrary', 'SeleniumLibrary.keywords',
+                      'SeleniumLibrary.locators', 'SeleniumLibrary.utils'],
       include_package_data = True,
       )
diff --git a/src/Selenium2Library/__init__.py b/src/SeleniumLibrary/__init__.py
similarity index 86%
rename from src/Selenium2Library/__init__.py
rename to src/SeleniumLibrary/__init__.py
index 26c13e14..a4291991 100644
--- a/src/Selenium2Library/__init__.py
+++ b/src/SeleniumLibrary/__init__.py
@@ -36,23 +36,23 @@ from .utils import LibraryListener
 __version__ = '3.0.0.dev1'
 
 
-class Selenium2Library(DynamicCore):
-    """Selenium2Library is a web testing library for Robot Framework.
+class SeleniumLibrary(DynamicCore):
+    """SeleniumLibrary is a web testing library for Robot Framework.
 
-    This document is about using Selenium2Library. For information about
+    This document is about using SeleniumLibrary. For information about
     installation, support, and more please visit the
-    [https://github.com/robotframework/Selenium2Library|project page].
+    [https://github.com/robotframework/SeleniumLibrary|project page].
 
-    Selenium2Library uses the Selenium 2 (WebDriver) libraries internally to control a web browser.
+    SeleniumLibrary uses the Selenium 2 (WebDriver) libraries internally to control a web browser.
     See http://seleniumhq.org/docs/03_webdriver.html for more information on Selenium 2
     and WebDriver.
 
-    Selenium2Library runs tests in a real browser instance. It should work in
+    SeleniumLibrary runs tests in a real browser instance. It should work in
     most modern browsers and can be used with both Python and Jython interpreters.
 
     = Before running tests =
 
-    Prior to running test cases using Selenium2Library, Selenium2Library must be
+    Prior to running test cases using SeleniumLibrary, SeleniumLibrary must be
     imported into your Robot test suite (see `importing` section), and the
     `Open Browser` keyword must be used to open a browser to the desired location.
 
@@ -60,7 +60,7 @@ class Selenium2Library(DynamicCore):
     *--- Note important change starting with Version 1.7.0 release ---*
     = Locating or specifying elements =
 
-    All keywords in Selenium2Library that need to find an element on the page
+    All keywords in SeleniumLibrary that need to find an element on the page
     take an argument, either a `locator` or now a `webelement`. `locator`
     is a string that describes how to locate an element using a syntax
     specifying different location strategies. `webelement` is a variable that
@@ -84,7 +84,7 @@ class Selenium2Library(DynamicCore):
     | Click Element    (//div)[2]    # xpath
 
     In the explicit way, it is possible to specify the approach
-    Selenium2Library should take to find an element by specifying a lookup
+    SeleniumLibrary should take to find an element by specifying a lookup
     strategy with a locator prefix. Supported strategies are:
 
     | *Strategy* | *Example*                               | *Description*                                   |
@@ -109,13 +109,13 @@ class Selenium2Library(DynamicCore):
     This can be fixed by changing the locator to:
     | Click Link    default=page?a=b
 
-    Please note that jQuery is not provided by Selenium2Library
+    Please note that jQuery is not provided by SeleniumLibrary
     and if there is need to use jQuery locators, the system
     under test must provide the jQuery library.
 
     *Using webelements*
     ------------------
-    Starting with version 1.7 of the Selenium2Library, one can pass an argument
+    Starting with version 1.7 of the SeleniumLibrary, one can pass an argument
     that contains a WebElement instead of a string locator. To get a WebElement,
     use the new `Get WebElements` keyword.  For example:
 
@@ -204,7 +204,7 @@ class Selenium2Library(DynamicCore):
                  run_on_failure='Capture Page Screenshot',
                  screenshot_root_directory=None):
 
-        """Selenium2Library can be imported with optional arguments.
+        """SeleniumLibrary can be imported with optional arguments.
 
         `timeout` is the default timeout used to wait for all waiting actions.
         It can be later set with `Set Selenium Timeout`.
@@ -218,7 +218,7 @@ class Selenium2Library(DynamicCore):
         __ http://seleniumhq.org/docs/04_webdriver_advanced.html#explicit-and-implicit-waits
 
         `run_on_failure` specifies the name of a keyword (from any available
-        libraries) to execute when a Selenium2Library keyword fails. By default
+        libraries) to execute when a SeleniumLibrary keyword fails. By default
         `Capture Page Screenshot` will be used to take a screenshot of the current page.
         Using the value "Nothing" will disable this feature altogether. See
         `Register Keyword To Run On Failure` keyword for more information about this
@@ -228,11 +228,11 @@ class Selenium2Library(DynamicCore):
         stored in. If not provided the default directory will be where robotframework places its logfile.
 
         Examples:
-        | Library `|` Selenium2Library `|` 15                                            | # Sets default timeout to 15 seconds                                       |
-        | Library `|` Selenium2Library `|` 0 `|` 5                                       | # Sets default timeout to 0 seconds and default implicit_wait to 5 seconds |
-        | Library `|` Selenium2Library `|` 5 `|` run_on_failure=Log Source               | # Sets default timeout to 5 seconds and runs `Log Source` on failure       |
-        | Library `|` Selenium2Library `|` implicit_wait=5 `|` run_on_failure=Log Source | # Sets default implicit_wait to 5 seconds and runs `Log Source` on failure |
-        | Library `|` Selenium2Library `|` timeout=10      `|` run_on_failure=Nothing    | # Sets default timeout to 10 seconds and does nothing on failure           |
+        | Library `|` SeleniumLibrary `|` 15                                            | # Sets default timeout to 15 seconds                                       |
+        | Library `|` SeleniumLibrary `|` 0 `|` 5                                       | # Sets default timeout to 0 seconds and default implicit_wait to 5 seconds |
+        | Library `|` SeleniumLibrary `|` 5 `|` run_on_failure=Log Source               | # Sets default timeout to 5 seconds and runs `Log Source` on failure       |
+        | Library `|` SeleniumLibrary `|` implicit_wait=5 `|` run_on_failure=Log Source | # Sets default implicit_wait to 5 seconds and runs `Log Source` on failure |
+        | Library `|` SeleniumLibrary `|` timeout=10      `|` run_on_failure=Nothing    | # Sets default timeout to 10 seconds and does nothing on failure           |
         """
         self._run_on_failure_keyword = None
         self._running_on_failure_routine = False
@@ -290,18 +290,18 @@ class Selenium2Library(DynamicCore):
 
     @property
     def _cache(self):
-        warnings.warn('"Selenium2Library._cache" is deprecated, '
+        warnings.warn('"SeleniumLibrary._cache" is deprecated, '
                       'use public API instead.', DeprecationWarning)
         return self._browsers
 
     def _current_browser(self):
-        warnings.warn('"Selenium2Library._current_browser" is deprecated, '
-                      'use "Selenium2Library._browser" instead.',
+        warnings.warn('"SeleniumLibrary._current_browser" is deprecated, '
+                      'use "SeleniumLibrary._browser" instead.',
                       DeprecationWarning)
         return self._browser
 
     def _run_on_failure(self):
-        warnings.warn('"Selenium2Library._run_on_failure" is deprecated, '
-                      'use "Selenium2Library.run_on_failure" instead.',
+        warnings.warn('"SeleniumLibrary._run_on_failure" is deprecated, '
+                      'use "SeleniumLibrary.run_on_failure" instead.',
                       DeprecationWarning)
         self.run_on_failure()
diff --git a/src/Selenium2Library/base/__init__.py b/src/SeleniumLibrary/base/__init__.py
similarity index 100%
rename from src/Selenium2Library/base/__init__.py
rename to src/SeleniumLibrary/base/__init__.py
diff --git a/src/Selenium2Library/base/context.py b/src/SeleniumLibrary/base/context.py
similarity index 100%
rename from src/Selenium2Library/base/context.py
rename to src/SeleniumLibrary/base/context.py
diff --git a/src/Selenium2Library/base/librarycomponent.py b/src/SeleniumLibrary/base/librarycomponent.py
similarity index 100%
rename from src/Selenium2Library/base/librarycomponent.py
rename to src/SeleniumLibrary/base/librarycomponent.py
diff --git a/src/Selenium2Library/base/robotlibcore.py b/src/SeleniumLibrary/base/robotlibcore.py
similarity index 100%
rename from src/Selenium2Library/base/robotlibcore.py
rename to src/SeleniumLibrary/base/robotlibcore.py
diff --git a/src/Selenium2Library/keywords/__init__.py b/src/SeleniumLibrary/keywords/__init__.py
similarity index 100%
rename from src/Selenium2Library/keywords/__init__.py
rename to src/SeleniumLibrary/keywords/__init__.py
diff --git a/src/Selenium2Library/keywords/alert.py b/src/SeleniumLibrary/keywords/alert.py
similarity index 97%
rename from src/Selenium2Library/keywords/alert.py
rename to src/SeleniumLibrary/keywords/alert.py
index 098de272..fe45a624 100644
--- a/src/Selenium2Library/keywords/alert.py
+++ b/src/SeleniumLibrary/keywords/alert.py
@@ -20,9 +20,9 @@ from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
-from Selenium2Library.base import keyword
-from Selenium2Library.base import LibraryComponent
-from Selenium2Library.utils import is_truthy
+from SeleniumLibrary.base import keyword
+from SeleniumLibrary.base import LibraryComponent
+from SeleniumLibrary.utils import is_truthy
 
 
 class AlertKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/browsermanagement.py b/src/SeleniumLibrary/keywords/browsermanagement.py
similarity index 99%
rename from src/Selenium2Library/keywords/browsermanagement.py
rename to src/SeleniumLibrary/keywords/browsermanagement.py
index 7018ceed..f21df473 100644
--- a/src/Selenium2Library/keywords/browsermanagement.py
+++ b/src/SeleniumLibrary/keywords/browsermanagement.py
@@ -23,9 +23,9 @@ from robot.utils import secs_to_timestr, timestr_to_secs
 from selenium import webdriver
 from selenium.common.exceptions import NoSuchWindowException
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.locators.windowmanager import WindowManager
-from Selenium2Library.utils import is_truthy, is_falsy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.locators.windowmanager import WindowManager
+from SeleniumLibrary.utils import is_truthy, is_falsy
 
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
@@ -343,7 +343,7 @@ class BrowserManagementKeywords(LibraryComponent):
         string 'new': select the last-indexed window assuming it is the newest opened window
         window list: select the first window not in given list (See 'List Windows' to get the list)
 
-        It is also possible to specify the approach Selenium2Library should take
+        It is also possible to specify the approach SeleniumLibrary should take
         to find a window by specifying a locator strategy:
 
         | *Strategy* | *Example*                               | *Description*                        |
diff --git a/src/Selenium2Library/keywords/cookie.py b/src/SeleniumLibrary/keywords/cookie.py
similarity index 95%
rename from src/Selenium2Library/keywords/cookie.py
rename to src/SeleniumLibrary/keywords/cookie.py
index dbab5707..eeff2de7 100644
--- a/src/Selenium2Library/keywords/cookie.py
+++ b/src/SeleniumLibrary/keywords/cookie.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.utils import is_truthy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.utils import is_truthy
 
 
 class CookieKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/element.py b/src/SeleniumLibrary/keywords/element.py
similarity index 99%
rename from src/Selenium2Library/keywords/element.py
rename to src/SeleniumLibrary/keywords/element.py
index e8594a82..429d417e 100644
--- a/src/Selenium2Library/keywords/element.py
+++ b/src/SeleniumLibrary/keywords/element.py
@@ -17,10 +17,10 @@
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.keywords.formelement import FormElementKeywords
-from Selenium2Library.utils import escape_xpath_value
-from Selenium2Library.utils import is_truthy, is_falsy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.keywords.formelement import FormElementKeywords
+from SeleniumLibrary.utils import escape_xpath_value
+from SeleniumLibrary.utils import is_truthy, is_falsy
 
 
 class ElementKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/formelement.py b/src/SeleniumLibrary/keywords/formelement.py
similarity index 99%
rename from src/Selenium2Library/keywords/formelement.py
rename to src/SeleniumLibrary/keywords/formelement.py
index f4d789e5..8abc40e9 100644
--- a/src/Selenium2Library/keywords/formelement.py
+++ b/src/SeleniumLibrary/keywords/formelement.py
@@ -16,8 +16,8 @@
 
 import os
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.utils import is_falsy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.utils import is_falsy
 
 
 class FormElementKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/javascript.py b/src/SeleniumLibrary/keywords/javascript.py
similarity index 98%
rename from src/Selenium2Library/keywords/javascript.py
rename to src/SeleniumLibrary/keywords/javascript.py
index 4f2b9de0..4974cbaf 100644
--- a/src/Selenium2Library/keywords/javascript.py
+++ b/src/SeleniumLibrary/keywords/javascript.py
@@ -16,7 +16,7 @@
 
 import os
 
-from Selenium2Library.base import LibraryComponent, keyword
+from SeleniumLibrary.base import LibraryComponent, keyword
 
 
 class JavaScriptKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/runonfailure.py b/src/SeleniumLibrary/keywords/runonfailure.py
similarity index 93%
rename from src/Selenium2Library/keywords/runonfailure.py
rename to src/SeleniumLibrary/keywords/runonfailure.py
index de10396e..f968255d 100644
--- a/src/Selenium2Library/keywords/runonfailure.py
+++ b/src/SeleniumLibrary/keywords/runonfailure.py
@@ -16,17 +16,17 @@
 
 from robot.libraries.BuiltIn import BuiltIn
 
-from Selenium2Library.base import LibraryComponent, keyword
+from SeleniumLibrary.base import LibraryComponent, keyword
 
 
 class RunOnFailureKeywords(LibraryComponent):
 
     @keyword
     def register_keyword_to_run_on_failure(self, keyword):
-        """Sets the keyword to execute when a Selenium2Library keyword fails.
+        """Sets the keyword to execute when a SeleniumLibrary keyword fails.
 
         `keyword_name` is the name of a keyword (from any available
-        libraries) that  will be executed if a Selenium2Library keyword fails.
+        libraries) that  will be executed if a SeleniumLibrary keyword fails.
         It is not possible to use a keyword that requires arguments.
         Using the value "Nothing" will disable this feature altogether.
 
diff --git a/src/Selenium2Library/keywords/screenshot.py b/src/SeleniumLibrary/keywords/screenshot.py
similarity index 97%
rename from src/Selenium2Library/keywords/screenshot.py
rename to src/SeleniumLibrary/keywords/screenshot.py
index 5b1757f3..9ce8ea51 100644
--- a/src/Selenium2Library/keywords/screenshot.py
+++ b/src/SeleniumLibrary/keywords/screenshot.py
@@ -22,9 +22,9 @@ from robot.libraries.BuiltIn import BuiltIn
 from robot.libraries.BuiltIn import RobotNotRunningError
 from robot.utils import get_link_path
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.utils import events
-from Selenium2Library.utils import is_falsy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.utils import events
+from SeleniumLibrary.utils import is_falsy
 
 
 class ScreenshotKeywords(LibraryComponent):
@@ -67,7 +67,7 @@ class ScreenshotKeywords(LibraryComponent):
         given in absolute format. If an absolute or relative path is given
         but the path does not exist it will be created.
 
-        Starting from Selenium2Library 1.8 if ``filename`` contains _{index}_
+        Starting from SeleniumLibrary 1.8 if ``filename`` contains _{index}_
         characters, it will be automatically replaced with running index.
         The running index is unique for each different filename. The absolute
         path of the saved screenshot is always returned and it does not depend
diff --git a/src/Selenium2Library/keywords/selectelement.py b/src/SeleniumLibrary/keywords/selectelement.py
similarity index 99%
rename from src/Selenium2Library/keywords/selectelement.py
rename to src/SeleniumLibrary/keywords/selectelement.py
index 2111f5c9..18c8df72 100644
--- a/src/Selenium2Library/keywords/selectelement.py
+++ b/src/SeleniumLibrary/keywords/selectelement.py
@@ -17,8 +17,8 @@
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.support.ui import Select
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.utils import is_truthy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.utils import is_truthy
 
 
 class SelectElementKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/tableelement.py b/src/SeleniumLibrary/keywords/tableelement.py
similarity index 98%
rename from src/Selenium2Library/keywords/tableelement.py
rename to src/SeleniumLibrary/keywords/tableelement.py
index 946c4e64..05ab8336 100644
--- a/src/Selenium2Library/keywords/tableelement.py
+++ b/src/SeleniumLibrary/keywords/tableelement.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.locators import TableElementFinder
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.locators import TableElementFinder
 
 
 class TableElementKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/keywords/waiting.py b/src/SeleniumLibrary/keywords/waiting.py
similarity index 98%
rename from src/Selenium2Library/keywords/waiting.py
rename to src/SeleniumLibrary/keywords/waiting.py
index ef748969..42ac2f60 100644
--- a/src/Selenium2Library/keywords/waiting.py
+++ b/src/SeleniumLibrary/keywords/waiting.py
@@ -18,9 +18,9 @@ import time
 
 from robot.utils import secs_to_timestr, timestr_to_secs
 
-from Selenium2Library.base import LibraryComponent, keyword
-from Selenium2Library.keywords.element import ElementKeywords
-from Selenium2Library.utils import is_truthy, is_falsy
+from SeleniumLibrary.base import LibraryComponent, keyword
+from SeleniumLibrary.keywords.element import ElementKeywords
+from SeleniumLibrary.utils import is_truthy, is_falsy
 
 
 class WaitingKeywords(LibraryComponent):
diff --git a/src/Selenium2Library/locators/__init__.py b/src/SeleniumLibrary/locators/__init__.py
similarity index 100%
rename from src/Selenium2Library/locators/__init__.py
rename to src/SeleniumLibrary/locators/__init__.py
diff --git a/src/Selenium2Library/locators/customlocator.py b/src/SeleniumLibrary/locators/customlocator.py
similarity index 97%
rename from src/Selenium2Library/locators/customlocator.py
rename to src/SeleniumLibrary/locators/customlocator.py
index fbe8b595..c45a2273 100644
--- a/src/Selenium2Library/locators/customlocator.py
+++ b/src/SeleniumLibrary/locators/customlocator.py
@@ -16,7 +16,7 @@
 
 from robot.libraries.BuiltIn import BuiltIn
 
-from Selenium2Library.base import ContextAware
+from SeleniumLibrary.base import ContextAware
 
 
 try:
diff --git a/src/Selenium2Library/locators/elementfinder.py b/src/SeleniumLibrary/locators/elementfinder.py
similarity index 98%
rename from src/Selenium2Library/locators/elementfinder.py
rename to src/SeleniumLibrary/locators/elementfinder.py
index e4bd0b49..eabe30b9 100644
--- a/src/Selenium2Library/locators/elementfinder.py
+++ b/src/SeleniumLibrary/locators/elementfinder.py
@@ -19,9 +19,9 @@ from robot.utils import NormalizedDict
 from selenium.webdriver.remote.webelement import WebElement
 
 from .customlocator import CustomLocator
-from Selenium2Library.base import ContextAware
-from Selenium2Library.utils import escape_xpath_value, events
-from Selenium2Library.utils import is_falsy
+from SeleniumLibrary.base import ContextAware
+from SeleniumLibrary.utils import escape_xpath_value, events
+from SeleniumLibrary.utils import is_falsy
 
 
 class ElementFinder(ContextAware):
diff --git a/src/Selenium2Library/locators/tableelementfinder.py b/src/SeleniumLibrary/locators/tableelementfinder.py
similarity index 99%
rename from src/Selenium2Library/locators/tableelementfinder.py
rename to src/SeleniumLibrary/locators/tableelementfinder.py
index 132e5a68..3728ef55 100644
--- a/src/Selenium2Library/locators/tableelementfinder.py
+++ b/src/SeleniumLibrary/locators/tableelementfinder.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from Selenium2Library.base import ContextAware
+from SeleniumLibrary.base import ContextAware
 
 from .elementfinder import ElementFinder
 


Test patch:
diff --git a/src/Selenium2Library/locators/windowmanager.py b/src/SeleniumLibrary/locators/windowmanager.py
similarity index 100%
rename from src/Selenium2Library/locators/windowmanager.py
rename to src/SeleniumLibrary/locators/windowmanager.py
diff --git a/src/Selenium2Library/resources/firefoxprofile/localstore.rdf b/src/SeleniumLibrary/resources/firefoxprofile/localstore.rdf
similarity index 100%
rename from src/Selenium2Library/resources/firefoxprofile/localstore.rdf
rename to src/SeleniumLibrary/resources/firefoxprofile/localstore.rdf
diff --git a/src/Selenium2Library/resources/firefoxprofile/prefs.js b/src/SeleniumLibrary/resources/firefoxprofile/prefs.js
similarity index 100%
rename from src/Selenium2Library/resources/firefoxprofile/prefs.js
rename to src/SeleniumLibrary/resources/firefoxprofile/prefs.js
diff --git a/src/Selenium2Library/utils/__init__.py b/src/SeleniumLibrary/utils/__init__.py
similarity index 100%
rename from src/Selenium2Library/utils/__init__.py
rename to src/SeleniumLibrary/utils/__init__.py
diff --git a/src/Selenium2Library/utils/browsercache.py b/src/SeleniumLibrary/utils/browsercache.py
similarity index 100%
rename from src/Selenium2Library/utils/browsercache.py
rename to src/SeleniumLibrary/utils/browsercache.py
diff --git a/src/Selenium2Library/utils/events/__init__.py b/src/SeleniumLibrary/utils/events/__init__.py
similarity index 100%
rename from src/Selenium2Library/utils/events/__init__.py
rename to src/SeleniumLibrary/utils/events/__init__.py
diff --git a/src/Selenium2Library/utils/events/event.py b/src/SeleniumLibrary/utils/events/event.py
similarity index 100%
rename from src/Selenium2Library/utils/events/event.py
rename to src/SeleniumLibrary/utils/events/event.py
diff --git a/src/Selenium2Library/utils/events/scope_event.py b/src/SeleniumLibrary/utils/events/scope_event.py
similarity index 100%
rename from src/Selenium2Library/utils/events/scope_event.py
rename to src/SeleniumLibrary/utils/events/scope_event.py
diff --git a/src/Selenium2Library/utils/librarylistener.py b/src/SeleniumLibrary/utils/librarylistener.py
similarity index 100%
rename from src/Selenium2Library/utils/librarylistener.py
rename to src/SeleniumLibrary/utils/librarylistener.py
diff --git a/src/Selenium2Library/utils/types.py b/src/SeleniumLibrary/utils/types.py
similarity index 100%
rename from src/Selenium2Library/utils/types.py
rename to src/SeleniumLibrary/utils/types.py
diff --git a/test/README.rst b/test/README.rst
index 74f6924d..65680c12 100644
--- a/test/README.rst
+++ b/test/README.rst
@@ -11,7 +11,7 @@ Before running the test, install the dependencies::
 Unit and Acceptance Tests
 -------------------------
 
-The test directory contains everything needed to run Selenium2Library
+The test directory contains everything needed to run SeleniumLibrary
 tests with Robot Framework. This includes:
 
 - Unit tests under `unit` directory.
@@ -41,7 +41,7 @@ system settings, which python is used by default. It is possible to run test
 by using different interpreter by using the `--interpreter` command line
 argument.
 
-Starting from version 2.0 onwards the Selenium2Library is tested by using 
+Starting from version 2.0 onwards the SeleniumLibrary is tested by using 
 Python 2 and 3. Other interpreters are not tested by the development team.
 
 
diff --git a/test/acceptance/resource.robot b/test/acceptance/resource.robot
index a9d25acd..ce76d1ac 100644
--- a/test/acceptance/resource.robot
+++ b/test/acceptance/resource.robot
@@ -1,5 +1,5 @@
 *** Setting ***
-Library           Selenium2Library    run_on_failure=Nothing    implicit_wait=0
+Library           SeleniumLibrary    run_on_failure=Nothing    implicit_wait=0
 Library           Collections
 Library           OperatingSystem
 
diff --git a/test/resources/testlibs/CustomSeleniumKeywords.py b/test/resources/testlibs/CustomSeleniumKeywords.py
index 32c41bbf..b3e92c07 100755
--- a/test/resources/testlibs/CustomSeleniumKeywords.py
+++ b/test/resources/testlibs/CustomSeleniumKeywords.py
@@ -1,18 +1,18 @@
 from robot.libraries.BuiltIn import BuiltIn
 
-from Selenium2Library import Selenium2Library
-from Selenium2Library.base import keyword
+from SeleniumLibrary import SeleniumLibrary
+from SeleniumLibrary.base import keyword
 
 
-class CustomSeleniumKeywords(Selenium2Library):
+class CustomSeleniumKeywords(SeleniumLibrary):
 
     def __init__(self, *args, **kwargs):
-        """Share `Selenium2Library`'s cache of browsers, so that
+        """Share `SeleniumLibrary`'s cache of browsers, so that
         we don't have to open a separate browser instance for the
         `Run On Failure Keyword Only Called Once` test."""
         super(CustomSeleniumKeywords, self).__init__(*args, **kwargs)
-        s2l = BuiltIn().get_library_instance("Selenium2Library")
-        self._browsers = s2l._browsers
+        sl = BuiltIn().get_library_instance("SeleniumLibrary")
+        self._browsers = sl._browsers
 
     @keyword
     def custom_selenium_keyword(self):
diff --git a/test/run_tests.py b/test/run_tests.py
index 8aa45223..83088efd 100755
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-"""Script to run Selenium2Library acceptance tests.
+"""Script to run SeleniumLibrary acceptance tests.
 
 Tests are executed using Robot Framework and results verified automatically
 afterwards using `robotstatuschecker` tool. The tool can be installed using
@@ -65,7 +65,7 @@ SAUCE_USERNAME = os.environ.get("SAUCE_USERNAME", None)
 SAUCE_ACCESS_KEY = os.environ.get("SAUCE_ACCESS_KEY", None)
 
 ROBOT_OPTIONS = [
-    '--doc', 'Selenium2Library acceptance tests with {browser}',
+    '--doc', 'SeleniumLibrary acceptance tests with {browser}',
     '--outputdir', RESULTS_DIR,
     '--variable', 'BROWSER:{browser}',
     '--report', 'NONE',
@@ -221,7 +221,7 @@ if __name__ == '__main__':
         print(
             'Can not run test with browser "{}" from SauceLabs with PR.\n'
             'SauceLabs can be used only when running with cron and from '
-            'Selenium2Library master branch, but your event type '
+            'SeleniumLibrary master branch, but your event type '
             'was "{}". Only Chrome is supported with PR and when using '
             'Travis'.format(browser, TRAVIS_EVENT_TYPE)
         )
diff --git a/test/unit/keywords/test_browsermanagement.py b/test/unit/keywords/test_browsermanagement.py
index 50712f3b..43460657 100644
--- a/test/unit/keywords/test_browsermanagement.py
+++ b/test/unit/keywords/test_browsermanagement.py
@@ -3,7 +3,7 @@ import unittest
 from mockito import when, mock, verify, verifyNoMoreInteractions, unstub
 from selenium import webdriver
 
-from Selenium2Library.keywords.browsermanagement import BrowserManagementKeywords
+from SeleniumLibrary.keywords.browsermanagement import BrowserManagementKeywords
 
 
 class BrowserManagementTests(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_alert.py b/test/unit/keywords/test_keyword_arguments_alert.py
index 12122a69..5ec5c3b1 100644
--- a/test/unit/keywords/test_keyword_arguments_alert.py
+++ b/test/unit/keywords/test_keyword_arguments_alert.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import when, mock, verify, unstub
 
-from Selenium2Library.keywords import AlertKeywords
+from SeleniumLibrary.keywords import AlertKeywords
 
 
 TRUES = ['True', True, '1', 1, 'text']
diff --git a/test/unit/keywords/test_keyword_arguments_browsermanagement.py b/test/unit/keywords/test_keyword_arguments_browsermanagement.py
index ce4586e9..b20a023f 100644
--- a/test/unit/keywords/test_keyword_arguments_browsermanagement.py
+++ b/test/unit/keywords/test_keyword_arguments_browsermanagement.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, unstub, when
 
-from Selenium2Library.keywords import BrowserManagementKeywords
+from SeleniumLibrary.keywords import BrowserManagementKeywords
 
 
 class KeywordArgumentsElementTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_cookie.py b/test/unit/keywords/test_keyword_arguments_cookie.py
index f7914f34..7decbefe 100644
--- a/test/unit/keywords/test_keyword_arguments_cookie.py
+++ b/test/unit/keywords/test_keyword_arguments_cookie.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, unstub, verify
 
-from Selenium2Library.keywords import CookieKeywords
+from SeleniumLibrary.keywords import CookieKeywords
 
 
 class KeywordArgumentsCookieTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_element.py b/test/unit/keywords/test_keyword_arguments_element.py
index a5525bb1..33b053bf 100644
--- a/test/unit/keywords/test_keyword_arguments_element.py
+++ b/test/unit/keywords/test_keyword_arguments_element.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, unstub, when
 
-from Selenium2Library.keywords import ElementKeywords
+from SeleniumLibrary.keywords import ElementKeywords
 
 
 class KeywordArgumentsElementTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_formelement.py b/test/unit/keywords/test_keyword_arguments_formelement.py
index b9dffb47..ecd67f62 100644
--- a/test/unit/keywords/test_keyword_arguments_formelement.py
+++ b/test/unit/keywords/test_keyword_arguments_formelement.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, unstub, when
 
-from Selenium2Library.keywords import FormElementKeywords
+from SeleniumLibrary.keywords import FormElementKeywords
 
 
 FALSES = ['False', False, '', None, 'NONE']
diff --git a/test/unit/keywords/test_keyword_arguments_screenshot.py b/test/unit/keywords/test_keyword_arguments_screenshot.py
index 596dcd11..75a72afd 100644
--- a/test/unit/keywords/test_keyword_arguments_screenshot.py
+++ b/test/unit/keywords/test_keyword_arguments_screenshot.py
@@ -3,8 +3,8 @@ import unittest
 from mockito import mock, unstub, when, verify
 from mockito.matchers import ANY
 
-from Selenium2Library.keywords import ScreenshotKeywords
-from Selenium2Library.utils import events
+from SeleniumLibrary.keywords import ScreenshotKeywords
+from SeleniumLibrary.utils import events
 
 
 class KeywordArgumentsElementTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_selectelement.py b/test/unit/keywords/test_keyword_arguments_selectelement.py
index 2ae6c2b7..71e76544 100644
--- a/test/unit/keywords/test_keyword_arguments_selectelement.py
+++ b/test/unit/keywords/test_keyword_arguments_selectelement.py
@@ -3,7 +3,7 @@ import unittest
 from mockito import mock, unstub, when
 
 
-from Selenium2Library.keywords import SelectElementKeywords
+from SeleniumLibrary.keywords import SelectElementKeywords
 
 
 class KeywordArgumentsElementTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_keyword_arguments_waiting.py b/test/unit/keywords/test_keyword_arguments_waiting.py
index cccc18fc..0aaf089d 100644
--- a/test/unit/keywords/test_keyword_arguments_waiting.py
+++ b/test/unit/keywords/test_keyword_arguments_waiting.py
@@ -3,7 +3,7 @@ import unittest
 from mockito import mock, unstub, when
 from mockito.matchers import ANY
 
-from Selenium2Library.keywords import WaitingKeywords
+from SeleniumLibrary.keywords import WaitingKeywords
 
 
 class KeywordArgumentsWaitingKeywordsTest(unittest.TestCase):
diff --git a/test/unit/keywords/test_runonfailure_from_lib.py b/test/unit/keywords/test_runonfailure_from_lib.py
index a221c17b..a375066e 100644
--- a/test/unit/keywords/test_runonfailure_from_lib.py
+++ b/test/unit/keywords/test_runonfailure_from_lib.py
@@ -2,23 +2,23 @@ import unittest
 
 from mockito import when, unstub, verify
 
-from Selenium2Library import Selenium2Library
-from Selenium2Library.keywords import RunOnFailureKeywords
+from SeleniumLibrary import SeleniumLibrary
+from SeleniumLibrary.keywords import RunOnFailureKeywords
 
 
-class Selenium2LibraryRunOnFailureTest(unittest.TestCase):
+class SeleniumLibraryRunOnFailureTest(unittest.TestCase):
 
     def tearDown(self):
         unstub()
 
     def test_run_on_failure(self):
         when(RunOnFailureKeywords).run_on_failure().thenReturn(True)
-        s2l = Selenium2Library()
-        s2l.run_on_failure()
+        sl = SeleniumLibrary()
+        sl.run_on_failure()
         verify(RunOnFailureKeywords, times=1).run_on_failure()
 
     def test_underscore_run_on_failure(self):
         when(RunOnFailureKeywords).run_on_failure().thenReturn(True)
-        s2l = Selenium2Library()
-        s2l._run_on_failure()
+        sl = SeleniumLibrary()
+        sl._run_on_failure()
         verify(RunOnFailureKeywords, times=1).run_on_failure()
diff --git a/test/unit/keywords/test_windowmananger_window_info.py b/test/unit/keywords/test_windowmananger_window_info.py
index 5618cbae..fb1ec4ec 100644
--- a/test/unit/keywords/test_windowmananger_window_info.py
+++ b/test/unit/keywords/test_windowmananger_window_info.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, when, unstub
 
-from Selenium2Library.locators.windowmanager import WindowManager
+from SeleniumLibrary.locators.windowmanager import WindowManager
 from selenium.common.exceptions import WebDriverException
 
 SCRIPT = "return [ window.id, window.name ];"
diff --git a/test/unit/locators/test_elementfinder.py b/test/unit/locators/test_elementfinder.py
index 893fa5cc..a22b6b01 100644
--- a/test/unit/locators/test_elementfinder.py
+++ b/test/unit/locators/test_elementfinder.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import any, mock, verify, when, unstub
 
-from Selenium2Library.locators.elementfinder import ElementFinder
+from SeleniumLibrary.locators.elementfinder import ElementFinder
 
 
 class ElementFinderTests(unittest.TestCase):
diff --git a/test/unit/locators/test_locator_parser.py b/test/unit/locators/test_locator_parser.py
index 27573978..32795e7b 100644
--- a/test/unit/locators/test_locator_parser.py
+++ b/test/unit/locators/test_locator_parser.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock
 
-from Selenium2Library.locators.elementfinder import ElementFinder
+from SeleniumLibrary.locators.elementfinder import ElementFinder
 
 
 class LocatorParserTests(unittest.TestCase):
diff --git a/test/unit/locators/test_tableelementfinder.py b/test/unit/locators/test_tableelementfinder.py
index 788f9cf5..e92f1d4b 100644
--- a/test/unit/locators/test_tableelementfinder.py
+++ b/test/unit/locators/test_tableelementfinder.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, verify, when, unstub
 
-from Selenium2Library.locators.tableelementfinder import TableElementFinder
+from SeleniumLibrary.locators.tableelementfinder import TableElementFinder
 
 
 class ElementFinderTests(unittest.TestCase):
diff --git a/test/unit/locators/test_windowmanager.py b/test/unit/locators/test_windowmanager.py
index c398ba1d..ed83ab2e 100644
--- a/test/unit/locators/test_windowmanager.py
+++ b/test/unit/locators/test_windowmanager.py
@@ -3,7 +3,7 @@ import uuid
 
 from mockito import mock, unstub
 
-from Selenium2Library.locators.windowmanager import WindowManager
+from SeleniumLibrary.locators.windowmanager import WindowManager
 
 
 class WindowManagerTests(unittest.TestCase):
diff --git a/test/unit/utils/test_browsercache.py b/test/unit/utils/test_browsercache.py
index bb1c6d6c..0af45378 100644
--- a/test/unit/utils/test_browsercache.py
+++ b/test/unit/utils/test_browsercache.py
@@ -2,7 +2,7 @@ import unittest
 
 from mockito import mock, verify
 
-from Selenium2Library.utils import BrowserCache
+from SeleniumLibrary.utils import BrowserCache
 
 
 class BrowserCacheTests(unittest.TestCase):
diff --git a/test/unit/utils/test_package.py b/test/unit/utils/test_package.py
index 5f7cc26a..d1f8f8c8 100644
--- a/test/unit/utils/test_package.py
+++ b/test/unit/utils/test_package.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Selenium2Library.utils import escape_xpath_value
+from SeleniumLibrary.utils import escape_xpath_value
 
 
 class UtilsPackageTests(unittest.TestCase):
diff --git a/test/unit/utils/test_types.py b/test/unit/utils/test_types.py
index 8f0888e4..0cca4fbf 100644
--- a/test/unit/utils/test_types.py
+++ b/test/unit/utils/test_types.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Selenium2Library.utils import is_string, is_truthy, is_falsy
+from SeleniumLibrary.utils import is_string, is_truthy, is_falsy
 
 
 class IsstringTests(unittest.TestCase):