diff --git a/Database.md b/Database.md
index 07b6d49..be376f2 100644
--- a/Database.md
+++ b/Database.md
@@ -131,14 +131,14 @@ Licence entity gives validity to instance. For normal usage an instance needs va
 - _validUntil_ -- date and time until the licence is valid (expiration time)
 - _note_ -- optional note about the licence
 
-## LocalizedAssignment
+## LocalizedText
 
-LocalizedAssignment entity represent text or description of the problem in one language mutation. Exercises and assignments uses these text to display problem description to users. The text can be Markdown styled.
+LocalizedText entity represent text or description of the problem in one language mutation. Exercises and assignments uses these text to display problem description to users. The text can be Markdown styled.
 
-- _name_ -- title of this localized assignment
+- _name_ -- title of this localized text
 - _locale_ -- language code of locale this text is written in (for example _en_)
 - _description_ -- text content
-- _localizedAssignment_ -- key refering to parent localized assignment; when editing, new version is created as a child of the original one
+- _localizedText_ -- key refering to parent localized text; when editing, new version is created as a child of the original one
 - _createdAt_ -- date and time of creation
 
 ## Login
@@ -221,7 +221,7 @@ failure).
 
 - _user_ -- user key to whom this solution belongs to
 - _files_ -- exercise solution files which user uploaded and are associated with solution; not actual database column, one-to-many relation is stored by each file
-- _solutionRuntimeConfig_ -- runtime configuration key which was used during execution on worker
+- _runtimeConfig_ -- runtime configuration key which was used during execution on worker
 - _evaluated_ -- true if solution was evaluated and results were processed
 
 
@@ -243,9 +243,9 @@ SolutionEvaluation entity represents evaluation of student or reference solution
 
 SolutionFile entity is extension of UploadedFile entity, so they share one database table. Solution file has one additional column of associated solution key.
 
-## SolutionRuntimeConfig
+## RuntimeConfig
 
-SolutionRuntimeConfig entity connects job configuration to runtime environment. This entity is backed up on every update, old version is set as _createdFrom_ key in the new version. On student submission one runtime config is chosen based on files extensions and corresponding job configuration is used for evaluation in the backend.
+runtimeConfig entity connects job configuration to runtime environment. This entity is backed up on every update, old version is set as _createdFrom_ key in the new version. On student submission one runtime config is chosen based on files extensions and corresponding job configuration is used for evaluation in the backend.
 
 - _name_ -- human readable identificator of runtime configuration
 - _runtimeEnvironment_ -- corresponding runtime environment