diff --git a/PYGUIDE.md b/PYGUIDE.md
index 38b0686f..85a6113c 100644
--- a/PYGUIDE.md
+++ b/PYGUIDE.md
@@ -167,9 +167,9 @@ Attributes with known units should be explicit in method's comment.
 
 #### To do's.
 
-Pending to implement operations should be indicated with ToDo comments to highlight the missing functionality.
+Pending to implement operations should be indicated with todo comments to highlight the missing functionality.
 
 ```python
-  # ToDo: right now extracted at the city level, in the future should be extracted also at building level if exist
+  # todo: right now extracted at the city level, in the future should be extracted also at building level if exist
 ```
 
diff --git a/city_model_structure/building.py b/city_model_structure/building.py
index 092310ef..c6b1fb17 100644
--- a/city_model_structure/building.py
+++ b/city_model_structure/building.py
@@ -150,7 +150,7 @@ class Building(CityObject):
     """
     Raises not implemented error
     """
-    # ToDo: this need to be calculated based on the basement and attic heated values
+    # todo: this need to be calculated based on the basement and attic heated values
     raise NotImplementedError
 
   @property
diff --git a/exports/energy_systems/heat_pump_export.py b/exports/energy_systems/heat_pump_export.py
index 7c007b82..d7bb17dd 100644
--- a/exports/energy_systems/heat_pump_export.py
+++ b/exports/energy_systems/heat_pump_export.py
@@ -176,7 +176,7 @@ class HeatPumpExport:
       self._input_data["HPDisactivationTemperature"] = self._input_data["HPSupTemp"] - 2
       self._input_data["HPReactivationTemperature"] = self._input_data["HPSupTemp"] - 4
 
-    # compute maximum demand. TODO: This should come from catalog in the future
+    # compute maximum demand. todo: This should come from catalog in the future
     max_demand = self._compute_max_demand()
     # compute TESCapacity
     self._input_data["TESCapacity"] = self._input_data["HoursOfStorageAtMaxDemand"] * (max_demand * 3.6) / (
diff --git a/exports/formats/idf.py b/exports/formats/idf.py
index a4089b15..0f407936 100644
--- a/exports/formats/idf.py
+++ b/exports/formats/idf.py
@@ -425,7 +425,7 @@ class Idf:
           self._add_shading(building)
       else:
         self._add_block(building)
-    # TODO: this should change to specific variables per zone to process only the ones in the buildings_to_calculate
+    # todo: this should change to specific variables per zone to process only the ones in the buildings_to_calculate
     for building in self._target_buildings:
       continue
 
@@ -489,7 +489,7 @@ class Idf:
                                  Diffuse_Visible_Reflectance_of_Unglazed_Part_of_Shading_Surface=visible_reflectance,
                                  Fraction_of_Shading_Surface_That_Is_Glazed=0)
 
-    # TODO: Add properties for that name
+    # todo: Add properties for that name
 
   def _add_surfaces(self, building, zone_name):
     for internal_zone in building.internal_zones:
diff --git a/imports/construction/helpers/construction_helper.py b/imports/construction/helpers/construction_helper.py
index 04c45b6c..f29ba890 100644
--- a/imports/construction/helpers/construction_helper.py
+++ b/imports/construction/helpers/construction_helper.py
@@ -103,7 +103,7 @@ class ConstructionHelper:
     :param city: str
     :return: str
     """
-    # ToDo: Dummy function that needs to be implemented
+    # todo: Dummy function that needs to be implemented
     reference_city = 'Baltimore'
     if city is not None:
       reference_city = 'Baltimore'
diff --git a/unittests/test_exports.py b/unittests/test_exports.py
index ef45bef2..75dc96f0 100644
--- a/unittests/test_exports.py
+++ b/unittests/test_exports.py
@@ -103,10 +103,7 @@ class TestExports(TestCase):
     UsageFactory('comnet', city).enrich()
     try:
       ExportsFactory('idf', city, self._output_path).export()
-      ExportsFactory('idf', city, self._output_path, target_buildings=['gml_1066158', 'gml_1']).export()
-      ExportsFactory('idf', city, self._output_path, target_buildings=['gml_1066158'],
-                     adjacent_buildings=['gml_1']).export()
-      ExportsFactory('idf', city, self._output_path, target_buildings=['gml_1066158']).export()
+      ExportsFactory('idf', city, self._output_path, target_buildings=['gml_1066158', 'gml_1066159']).export()
     except Exception:
       self.fail("Idf ExportsFactory raised ExceptionType unexpectedly!")