diff --git a/employment-tasks/devops/luminor/README.md b/employment-tasks/devops/basic-api/README.md
similarity index 92%
rename from employment-tasks/devops/luminor/README.md
rename to employment-tasks/devops/basic-api/README.md
index 0d82ced4a..9df822d35 100644
--- a/employment-tasks/devops/luminor/README.md
+++ b/employment-tasks/devops/basic-api/README.md
@@ -1,4 +1,4 @@
-# Luminor Test Task
+# Site Reliability Engineer - Basic API Hosting Task
 
 ## Part 1 – The Web Service
 
@@ -34,6 +34,4 @@ Deploy this application to your favourite cloud provider using Terraform.
 
 ## Part 3 – NewRelic
 
-Implement NewRelic monitoring for this application using Terraform.
-
-Please send finished code, testing and results through mail.
\ No newline at end of file
+Implement NewRelic monitoring for this application using Terraform.
\ No newline at end of file
diff --git a/employment-tasks/devops/alpeso/README.md b/employment-tasks/devops/notbad-task/README.md
similarity index 75%
rename from employment-tasks/devops/alpeso/README.md
rename to employment-tasks/devops/notbad-task/README.md
index 92e25f87d..9a8dae77a 100644
--- a/employment-tasks/devops/alpeso/README.md
+++ b/employment-tasks/devops/notbad-task/README.md
@@ -1,13 +1,7 @@
-# Alpeso 
-
-# Alpeso Recruiting - SENIOR DEVOPS ENGINEER
-
-This is a test project within Alpeso's technical recruiting process.
+# Senior DevOps Engineer - NotBad Header based API
 
 Look at the following tasks and estimate how much time you will spend on them.
 
-In doubt of technical issues you can send an e-mail with your questions.
-
 ## Preconditions
 
 ### Technical & Knowledge
@@ -22,7 +16,7 @@ You need at least:
 ## The tasks
 1) We have a Terraform securitygroups.tf file. Every time Terraform runs, it says the security group in that file will be updated in place. Find a way to prevent this.  
 
-2) You have the alpeso-test.tar.gz archive. What we can improve?
+2) You have the keycloak-test.tar.gz archive. What we can improve?
     
 3) Provide infrastructure and create CI/CD with a web app that will listen to 8089 port and return "ReallyNotBad" string when POST request contains header "NotBad" with value "true", eg. `curl -X POST -H "NotBad: true" https://someurl:8089/` should return "ReallyNotBad".
 Use any technology you want to deploy the application to AWS. It can be Ansible, Terraform, etc. or a combination of some of them.
diff --git a/employment-tasks/devops/alpeso/alpeso-test.tar.gz b/employment-tasks/devops/notbad-task/keycloak-test.tar.gz
similarity index 100%
rename from employment-tasks/devops/alpeso/alpeso-test.tar.gz
rename to employment-tasks/devops/notbad-task/keycloak-test.tar.gz
diff --git a/employment-tasks/software-engineer/entain/README.md b/employment-tasks/software-engineer/game-task/README.md
similarity index 94%
rename from employment-tasks/software-engineer/entain/README.md
rename to employment-tasks/software-engineer/game-task/README.md
index 0d04ba74b..7e75d0f25 100644
--- a/employment-tasks/software-engineer/entain/README.md
+++ b/employment-tasks/software-engineer/game-task/README.md
@@ -1,8 +1,4 @@
-# Entain 
-
-Entain is one of the biggest companies, which hosts casinos like Olybet, Optibet etc. They are looking for a software engineer to join their team. 
-
-## Task
+## Software Engineer - Game Task
 
 ### Tools and technologies used: