diff --git a/README.md b/README.md
index f8404f42..cd86978b 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Currently available messaging services are [Telegram](https://telegram.org/), [M
 
 ## Background
 
-There are at least four different rental property marketplace sites that are widely used in Germany - [ImmoScout24](https://www.immobilienscout24.de/), [Immowelt](https://www.immowelt.de/), [WG-Gesucht](https://www.wg-gesucht.de/) and [eBay Kleinanzeigen](https://www.kleinanzeigen.de/). Most people end up searching through listings on all four sites on an almost daily basis during their rental search.
+There are at least four different rental property marketplace sites that are widely used in Germany - [ImmoScout24](https://www.immobilienscout24.de/), [Immowelt](https://www.immowelt.de/), [WG-Gesucht](https://www.wg-gesucht.de/) and [Kleinanzeigen](https://www.kleinanzeigen.de/). Most people end up searching through listings on all four sites on an almost daily basis during their rental search.
 In Italy on the other hand, [idealista](https://www.idealista.it), [Subito](https://www.subito.it) and [Immobiliare.it](https://www.immobiliare.it) are very common for real-estate hunting.
 
 With ```Flathunter```, instead of visiting the same pages on the same  sites every day, you can set the system up to scan every site, filtering by your search criteria, and notify you when new rental property becomes available that meets your criteria.
@@ -146,8 +146,8 @@ $ python config_wizard.py
 
 To configure the searches, simply visit the property portal of your choice (e.g. ImmoScout24), configure the search on the website to match your search criteria, then copy the URL of the results page into the config file. You can add as many URLs as you like, also multiple from the same website if you have multiple different criteria (e.g. running the same search in different areas).
 
- * Currently, eBay Kleinanzeigen, Immowelt, WG-Gesucht and Idealista only crawl the first page, so make sure to **sort by newest offers**.
- * Your links should point to the German version of the websites (in the case of eBay Kleinanzeigen, Immowelt, ImmoScout24 and WG-Gesucht), since it is tested only there. Otherwise you might have problems.
+ * Currently, Kleinanzeigen, Immowelt, WG-Gesucht and Idealista only crawl the first page, so make sure to **sort by newest offers**.
+ * Your links should point to the German version of the websites (in the case of Kleinanzeigen, Immowelt, ImmoScout24 and WG-Gesucht), since it is tested only there. Otherwise you might have problems.
  * For Idealista, the link should point to the Italian version of the website, for the same reason reported above.
  * For Immobiliare, the link should point to the Italian version of the website, for the same reasons reported above.
  * For Subito, the link should point to the Italian version of the website, for the same reasons reported above.
diff --git a/flathunter/crawler/kleinanzeigen.py b/flathunter/crawler/kleinanzeigen.py
index c85a30a2..c1134af9 100644
--- a/flathunter/crawler/kleinanzeigen.py
+++ b/flathunter/crawler/kleinanzeigen.py
@@ -1,4 +1,4 @@
-"""Expose crawler for Ebay Kleinanzeigen"""
+"""Expose crawler for Kleinanzeigen"""
 import re
 import datetime
 
@@ -8,7 +8,7 @@
 from flathunter.logging import logger
 
 class Kleinanzeigen(WebdriverCrawler):
-    """Implementation of Crawler interface for Ebay Kleinanzeigen"""
+    """Implementation of Crawler interface for Kleinanzeigen"""
 
     URL_PATTERN = re.compile(r'https://www\.kleinanzeigen\.de')
     MONTHS = {
diff --git a/flathunter/web/templates/about.html b/flathunter/web/templates/about.html
index 448e22f3..2c3d5b24 100644
--- a/flathunter/web/templates/about.html
+++ b/flathunter/web/templates/about.html
@@ -20,7 +20,7 @@ <h2 class="mx-auto">What is Flathunter?</h2>
   </div>
   <div class="row text-white my-2">
     <div class="intro col-sm-9 mx-auto text-left">
-      <p>Flathunter helps you find somewhere to live in Berlin, by periodically fetching apartment listings from the major property portals (ImmoScout, ImmoWelt, Ebay Kleinanzeigen and WG Gesucht) and sending the details of apartments that match your criteria to you in a Telegram message.</p>
+      <p>Flathunter helps you find somewhere to live in Berlin, by periodically fetching apartment listings from the major property portals (ImmoScout, ImmoWelt, Kleinanzeigen and WG Gesucht) and sending the details of apartments that match your criteria to you in a Telegram message.</p>
     </div>
   </div>
 
diff --git a/flathunter/web/templates/index.html b/flathunter/web/templates/index.html
index fe9fad24..c05f58d1 100644
--- a/flathunter/web/templates/index.html
+++ b/flathunter/web/templates/index.html
@@ -52,7 +52,7 @@
   <div class="container">
     <div class="row">
       <div class="intro col-sm-9 mx-auto">
-        <p>Flathunter helps you find somewhere to live in Berlin, by periodically fetching apartment listings from the major property portals (ImmoScout, ImmoWelt, Ebay Kleinanzeigen and WG Gesucht) and sending the details of apartments that match your criteria to you in a Telegram message.</p>
+        <p>Flathunter helps you find somewhere to live in Berlin, by periodically fetching apartment listings from the major property portals (ImmoScout, ImmoWelt, Kleinanzeigen and WG-Gesucht) and sending the details of apartments that match your criteria to you in a Telegram message.</p>
       </div>
     </div>
   </div>
diff --git a/flathunter/webdriver_crawler.py b/flathunter/webdriver_crawler.py
index 6d6f3b2e..18230852 100644
--- a/flathunter/webdriver_crawler.py
+++ b/flathunter/webdriver_crawler.py
@@ -1,4 +1,4 @@
-"""Expose crawler for Ebay Kleinanzeigen"""
+"""Expose crawler for Kleinanzeigen"""
 from typing import Optional
 
 from selenium.webdriver import Chrome
diff --git a/test/crawler/test_crawl_ebaykleinanzeigen.py b/test/crawler/test_crawl_kleinanzeigen.py
similarity index 100%
rename from test/crawler/test_crawl_ebaykleinanzeigen.py
rename to test/crawler/test_crawl_kleinanzeigen.py