diff --git a/src/apps/dashboard/tests/test_models.py b/src/apps/dashboard/tests/test_models.py
index 6dcf7c1..afb30a1 100644
--- a/src/apps/dashboard/tests/test_models.py
+++ b/src/apps/dashboard/tests/test_models.py
@@ -3,7 +3,7 @@ from django.db.utils import IntegrityError
 from django.test import TestCase
 from ..models import Item, List
 
-class ItemModelsTest(TestCase):
+class ItemModelTest(TestCase):
     def test_default_text(self):
         item = Item()
         self.assertEqual(item.text, "")
diff --git a/src/functional_tests/base.py b/src/functional_tests/base.py
index d220a94..02f6466 100644
--- a/src/functional_tests/base.py
+++ b/src/functional_tests/base.py
@@ -32,7 +32,7 @@ class FunctionalTest(StaticLiveServerTestCase):
         start_time = time.time()
         while True:
             try:
-                table = self.browser.find_element(By.ID, 'id-list-table')
+                table = self.browser.find_element(By.ID, 'id_list_table')
                 rows = table.find_elements(By.TAG_NAME, 'tr')
                 self.assertIn(row_text, [row.text for row in rows])
                 return
diff --git a/src/templates/apps/dashboard/list.html b/src/templates/apps/dashboard/list.html
index d1b6ad8..ec9340b 100644
--- a/src/templates/apps/dashboard/list.html
+++ b/src/templates/apps/dashboard/list.html
@@ -6,7 +6,7 @@
 {% block form_action %}{% url "view_list" list.id %}{% endblock form_action %}
 
 {% block table %}
-    <table id="id-list-table" class="table">
+    <table id="id_list_table" class="table">
         {% for item in list.item_set.all %}
             <tr><td>{{ forloop.counter }}. {{ item.text }}</td></tr>
         {% endfor %}