diff --git a/bbcli/services/__init__.py b/bbcli/services/__init__.py
index f30c4e42d3b55b2e31bb4a281935a9f0513de3f0..aa951f169f8041caf708990893dd0631718ad8fa 100644
--- a/bbcli/services/__init__.py
+++ b/bbcli/services/__init__.py
@@ -1,2 +1,2 @@
 from .authorization_service import *
-from bbcli.utils.URL_builder import URLBuilder
\ No newline at end of file
+from bbcli.utils.URL_builder import URL_builder
\ No newline at end of file
diff --git a/bbcli/services/announcements_service.py b/bbcli/services/announcements_service.py
index e7351e356de99138d94bd5e06463f5fa83f10480..504b9fde124b398814b2a08680ed3d2940a6f3a5 100644
--- a/bbcli/services/announcements_service.py
+++ b/bbcli/services/announcements_service.py
@@ -6,9 +6,9 @@ from bbcli.services.courses_service import list_courses
 from bbcli.utils.utils import set_cookies
 import click
 
-from bbcli.utils.URL_builder import URLBuilder
+from bbcli.utils.URL_builder import URL_builder
 
-url_builder = URLBuilder()
+url_builder = URL_builder()
 
 def list_announcements(session: requests.Session, user_name: str):
     courses = list_courses(session, user_name=user_name)
diff --git a/bbcli/services/contents_service.py b/bbcli/services/contents_service.py
index aa11c41624be9e4e0e42904fb34937ee9b9db91e..041d2969d2f2b03ba0a2d0b9287a162878fa7340 100644
--- a/bbcli/services/contents_service.py
+++ b/bbcli/services/contents_service.py
@@ -6,9 +6,9 @@ from tarfile import ENCODING
 from typing import Dict, Any
 import requests
 from bbcli.services.courses_service import list_courses
-from bbcli.utils.URL_builder import URLBuilder
+from bbcli.utils.URL_builder import URL_builder
 
-url_builder = URLBuilder()
+url_builder = URL_builder()
 
 # User gets a tree structure view of the courses content
 # where each content is listed something like this: _030303_1 Lectures Folder
diff --git a/bbcli/services/courses_service.py b/bbcli/services/courses_service.py
index c69fae73a0ee618a06c3b7bfbb58748c5ee200b0..088f08f5e9fbc905b395c5d50638b267eb59ae1f 100644
--- a/bbcli/services/courses_service.py
+++ b/bbcli/services/courses_service.py
@@ -3,9 +3,9 @@ from typing import Dict, Any, List
 import requests
 from datetime import date
 
-from bbcli.utils.URL_builder import URLBuilder
+from bbcli.utils.URL_builder import URL_builder
 
-url_builder = URLBuilder()
+url_builder = URL_builder()
 
 
 def list_courses(session: requests.Session, user_name: str) -> Any:
diff --git a/bbcli/utils/URL_builder.py b/bbcli/utils/URL_builder.py
index b8db2a82458fa540f8b6cce54bb44cbe153dcda1..0c67e661481cfea2839493a5c21a45a876f04e30 100644
--- a/bbcli/utils/URL_builder.py
+++ b/bbcli/utils/URL_builder.py
@@ -64,7 +64,7 @@ class Builder(ABC):
         pass
 
 
-class URLBuilder(Builder):
+class URL_builder(Builder):
 
     def __init__(self) -> None:
         self.reset()
@@ -81,35 +81,35 @@ class URLBuilder(Builder):
 
 
 
-    def base_v1(self) -> URLBuilder:
+    def base_v1(self) -> URL_builder:
         self._product.add(f'{DOMAIN}{API_BASE}/v1')
         return self
     
-    def base_v2(self) -> URLBuilder:
+    def base_v2(self) -> URL_builder:
         self._product.add(f'{DOMAIN}{API_BASE}/v2')
         return self
 
-    def base_v3(self) -> URLBuilder:
+    def base_v3(self) -> URL_builder:
         self._product.add(f'{DOMAIN}{API_BASE}/v3')
         return self
 
-    def add_courses(self) -> URLBuilder:
+    def add_courses(self) -> URL_builder:
         self._product.add('/courses')
         return self
 
-    def add_users(self) -> URLBuilder:
+    def add_users(self) -> URL_builder:
         self._product.add('/users')
         return self
     
-    def add_announcements(self) -> URLBuilder:
+    def add_announcements(self) -> URL_builder:
         self._product.add('/announcements')
         return self
 
-    def add_contents(self) -> URLBuilder:
+    def add_contents(self) -> URL_builder:
         self._product.add('/contents')
         return self
 
-    def add_terms(self) -> URLBuilder:
+    def add_terms(self) -> URL_builder:
         self._product.add('/terms')
         return self
 
@@ -121,7 +121,7 @@ class URLBuilder(Builder):
         self._product.add('/attachments')
         return self
 
-    def add_id(self, id:str, id_type:str=None) -> URLBuilder:
+    def add_id(self, id:str, id_type:str=None) -> URL_builder:
         if id_type:
             self._product.add(f'/{id_type}:{id}')
         else:
diff --git a/bbcli/utils/error_handler.py b/bbcli/utils/error_handler.py
index 3ef18c457e14b69fb63848806eca035cc32ac56f..a03b65d6e90d81e47f888eb56cc0d8e023fc22a3 100644
--- a/bbcli/utils/error_handler.py
+++ b/bbcli/utils/error_handler.py
@@ -3,6 +3,7 @@ import click
 
 # ERROR HANDLER SHOULD BE USED IN VIEW??
 
+
 def HTTP_exception_handler(func):
     def inner_function(*args, **kwargs):
         try:
@@ -10,4 +11,4 @@ def HTTP_exception_handler(func):
         except requests.exceptions.HTTPError as err:
             click.echo(err)
             click.Abort()
-    return inner_function     
\ No newline at end of file
+    return inner_function