diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
index 44ab3aa..44cc9e2 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
@@ -75,7 +75,7 @@
           .DetailKriteriaPageConnector(state)(_)
           .apply
       )
-      .collectSignal[Page.NovyDukazKriteria](
+      .collectSignal[Page.UpravDukazKriteria](
         connectors
           .UpravDukazKriteriaPageConnector(state)(_)
           .apply

diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
index 44ab3aa..44cc9e2 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
@@ -75,7 +75,7 @@
           .DetailKriteriaPageConnector(state)(_)
           .apply
       )
-      .collectSignal[Page.NovyDukazKriteria](
+      .collectSignal[Page.UpravDukazKriteria](
         connectors
           .UpravDukazKriteriaPageConnector(state)(_)
           .apply
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
index 8d56c55..cf9aa23 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
@@ -80,7 +80,7 @@
       )
   }
 
-  case class NovyDukazKriteria(
+  case class UpravDukazKriteria(
       osobniCislo: Titled[OsobniCislo],
       parametr: Titled[String],
       kriterium: Titled[String]
@@ -90,13 +90,13 @@
         Some(DetailKriteria(osobniCislo, parametr, kriterium))
       )
 
-  object NovyDukazKriteria {
+  object UpravDukazKriteria {
     def apply(
         o: UserInfo,
         p: Parameter,
         k: ParameterCriteria
-    ): NovyDukazKriteria =
-      NovyDukazKriteria(
+    ): UpravDukazKriteria =
+      UpravDukazKriteria(
         Titled(o.personalNumber, Some(o.name)),
         Titled(p.id, Some(p.name)),
         Titled(k.id, Some(k.id))
@@ -167,7 +167,7 @@
         ] / "kriterium" / segment[String] / endOfSegments,
         basePath = base
       ),
-      Route[Page.NovyDukazKriteria, (String, String, String)](
+      Route[Page.UpravDukazKriteria, (String, String, String)](
         encode = p =>
           (
             p.osobniCislo.value.toString,
@@ -175,7 +175,7 @@
             p.kriterium.value.replaceAll("\\.", "--")
           ),
         decode = p =>
-          Page.NovyDukazKriteria(
+          Page.UpravDukazKriteria(
             Titled(OsobniCislo(p._1)),
             Titled(p._2),
             Titled(p._3.replaceAll("--", "."))

diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
index 44ab3aa..44cc9e2 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
@@ -75,7 +75,7 @@
           .DetailKriteriaPageConnector(state)(_)
           .apply
       )
-      .collectSignal[Page.NovyDukazKriteria](
+      .collectSignal[Page.UpravDukazKriteria](
         connectors
           .UpravDukazKriteriaPageConnector(state)(_)
           .apply
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
index 8d56c55..cf9aa23 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
@@ -80,7 +80,7 @@
       )
   }
 
-  case class NovyDukazKriteria(
+  case class UpravDukazKriteria(
       osobniCislo: Titled[OsobniCislo],
       parametr: Titled[String],
       kriterium: Titled[String]
@@ -90,13 +90,13 @@
         Some(DetailKriteria(osobniCislo, parametr, kriterium))
       )
 
-  object NovyDukazKriteria {
+  object UpravDukazKriteria {
     def apply(
         o: UserInfo,
         p: Parameter,
         k: ParameterCriteria
-    ): NovyDukazKriteria =
-      NovyDukazKriteria(
+    ): UpravDukazKriteria =
+      UpravDukazKriteria(
         Titled(o.personalNumber, Some(o.name)),
         Titled(p.id, Some(p.name)),
         Titled(k.id, Some(k.id))
@@ -167,7 +167,7 @@
         ] / "kriterium" / segment[String] / endOfSegments,
         basePath = base
       ),
-      Route[Page.NovyDukazKriteria, (String, String, String)](
+      Route[Page.UpravDukazKriteria, (String, String, String)](
         encode = p =>
           (
             p.osobniCislo.value.toString,
@@ -175,7 +175,7 @@
             p.kriterium.value.replaceAll("\\.", "--")
           ),
         decode = p =>
-          Page.NovyDukazKriteria(
+          Page.UpravDukazKriteria(
             Titled(OsobniCislo(p._1)),
             Titled(p._2),
             Titled(p._3.replaceAll("--", "."))
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
index 6b129ab..e9b0f71 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
@@ -53,7 +53,7 @@
           DetailKriteriaPage($s)(state.actionBus.contramap {
             case DukazyKriteria.Add =>
               NavigateTo(
-                Page.NovyDukazKriteria(
+                Page.UpravDukazKriteria(
                   Page.Titled(s.osoba.osobniCislo, Some(s.osoba.jmeno)),
                   Page.Titled(s.parametr.id, Some(s.parametr.nazev)),
                   Page.Titled(s.kriterium.id, Some(s.kriterium.id))

diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
index 44ab3aa..44cc9e2 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Main.scala
@@ -75,7 +75,7 @@
           .DetailKriteriaPageConnector(state)(_)
           .apply
       )
-      .collectSignal[Page.NovyDukazKriteria](
+      .collectSignal[Page.UpravDukazKriteria](
         connectors
           .UpravDukazKriteriaPageConnector(state)(_)
           .apply
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
index 8d56c55..cf9aa23 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/Routes.scala
@@ -80,7 +80,7 @@
       )
   }
 
-  case class NovyDukazKriteria(
+  case class UpravDukazKriteria(
       osobniCislo: Titled[OsobniCislo],
       parametr: Titled[String],
       kriterium: Titled[String]
@@ -90,13 +90,13 @@
         Some(DetailKriteria(osobniCislo, parametr, kriterium))
       )
 
-  object NovyDukazKriteria {
+  object UpravDukazKriteria {
     def apply(
         o: UserInfo,
         p: Parameter,
         k: ParameterCriteria
-    ): NovyDukazKriteria =
-      NovyDukazKriteria(
+    ): UpravDukazKriteria =
+      UpravDukazKriteria(
         Titled(o.personalNumber, Some(o.name)),
         Titled(p.id, Some(p.name)),
         Titled(k.id, Some(k.id))
@@ -167,7 +167,7 @@
         ] / "kriterium" / segment[String] / endOfSegments,
         basePath = base
       ),
-      Route[Page.NovyDukazKriteria, (String, String, String)](
+      Route[Page.UpravDukazKriteria, (String, String, String)](
         encode = p =>
           (
             p.osobniCislo.value.toString,
@@ -175,7 +175,7 @@
             p.kriterium.value.replaceAll("\\.", "--")
           ),
         decode = p =>
-          Page.NovyDukazKriteria(
+          Page.UpravDukazKriteria(
             Titled(OsobniCislo(p._1)),
             Titled(p._2),
             Titled(p._3.replaceAll("--", "."))
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
index 6b129ab..e9b0f71 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala
@@ -53,7 +53,7 @@
           DetailKriteriaPage($s)(state.actionBus.contramap {
             case DukazyKriteria.Add =>
               NavigateTo(
-                Page.NovyDukazKriteria(
+                Page.UpravDukazKriteria(
                   Page.Titled(s.osoba.osobniCislo, Some(s.osoba.jmeno)),
                   Page.Titled(s.parametr.id, Some(s.parametr.nazev)),
                   Page.Titled(s.kriterium.id, Some(s.kriterium.id))
diff --git a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/UpravDukazKriteriaPageConnector.scala b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/UpravDukazKriteriaPageConnector.scala
index 9d4503c..a41d0d1 100644
--- a/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/UpravDukazKriteriaPageConnector.scala
+++ b/app/src/main/scala/cz/e_bs/cmi/mdr/pdb/app/connectors/UpravDukazKriteriaPageConnector.scala
@@ -23,7 +23,7 @@
 case class UpravDukazKriteriaPageConnector(
     state: UpravDukazKriteriaPageConnector.AppState
 )(
-    $page: Signal[Page.NovyDukazKriteria]
+    $page: Signal[Page.UpravDukazKriteria]
 )(using Router[Page]):
   val $paramChangeSignal =
     $page.splitOne(p =>
@@ -31,7 +31,7 @@
     )((x, _, _) => x)
   val $pageChangeSignal =
     $paramChangeSignal.map(
-      FetchParameterCriteria(_, _, _, Page.NovyDukazKriteria(_, _, _))
+      FetchParameterCriteria(_, _, _, Page.UpravDukazKriteria(_, _, _))
     )
 
   val $data = state.details.startWithNone