diff --git a/testing-modules/cucumber/pom.xml b/testing-modules/cucumber/pom.xml
index dda5fc8ce3..ab0f73adab 100644
--- a/testing-modules/cucumber/pom.xml
+++ b/testing-modules/cucumber/pom.xml
@@ -35,7 +35,6 @@
org.springframework.boot
spring-boot-starter-web
-
org.springframework.boot
spring-boot-starter-thymeleaf
diff --git a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/Application.java b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/Application.java
similarity index 88%
rename from testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/Application.java
rename to testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/Application.java
index fad34a07ba..0bd9e924a0 100644
--- a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/Application.java
+++ b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/Application.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags;
+package com.baeldung.cucumber.tags;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/HealthController.java b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/HealthController.java
similarity index 91%
rename from testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/HealthController.java
rename to testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/HealthController.java
index 24c8116307..b5d7751d2b 100644
--- a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/HealthController.java
+++ b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/HealthController.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.controller;
+package com.baeldung.cucumber.tags.controller;
import org.springframework.http.HttpStatus;
diff --git a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/UiController.java b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/UiController.java
similarity index 91%
rename from testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/UiController.java
rename to testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/UiController.java
index 73b705f10a..eab32c644b 100644
--- a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/controller/UiController.java
+++ b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/controller/UiController.java
@@ -1,6 +1,6 @@
-package com.baeldung.cucumber_tags.controller;
+package com.baeldung.cucumber.tags.controller;
-import com.baeldung.cucumber_tags.service.RandomNumberGeneratorService;
+import com.baeldung.cucumber.tags.service.RandomNumberGeneratorService;
import lombok.Data;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
diff --git a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorService.java b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorService.java
similarity index 83%
rename from testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorService.java
rename to testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorService.java
index b40c703593..6c3399f64c 100644
--- a/testing-modules/cucumber/src/main/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorService.java
+++ b/testing-modules/cucumber/src/main/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorService.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.service;
+package com.baeldung.cucumber.tags.service;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/AcceptanceTestRunnerIT.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/AcceptanceTestRunnerIT.java
similarity index 69%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/AcceptanceTestRunnerIT.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/AcceptanceTestRunnerIT.java
index 68d29b4b1c..fd712488d5 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/AcceptanceTestRunnerIT.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/AcceptanceTestRunnerIT.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance;
+package com.baeldung.cucumber.tags.acceptance;
import io.cucumber.junit.platform.engine.Cucumber;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/api/steps/HealthSteps.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/api/steps/HealthSteps.java
similarity index 88%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/api/steps/HealthSteps.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/api/steps/HealthSteps.java
index d491326ded..d809619a01 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/api/steps/HealthSteps.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/api/steps/HealthSteps.java
@@ -1,7 +1,7 @@
-package com.baeldung.cucumber_tags.acceptance.api.steps;
+package com.baeldung.cucumber.tags.acceptance.api.steps;
-import com.baeldung.cucumber_tags.acceptance.commonutil.ScenarioContextApi;
+import com.baeldung.cucumber.tags.acceptance.commonutil.ScenarioContextApi;
import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
import org.hamcrest.Matchers;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/CucumberEnvironment.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/CucumberEnvironment.java
similarity index 96%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/CucumberEnvironment.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/CucumberEnvironment.java
index f78f9b52f8..8ed9e02226 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/CucumberEnvironment.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/CucumberEnvironment.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.commonutil;
+package com.baeldung.cucumber.tags.acceptance.commonutil;
import org.openqa.selenium.InvalidArgumentException;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextApi.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextApi.java
similarity index 96%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextApi.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextApi.java
index 534608bd34..f35dcb04d5 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextApi.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextApi.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.commonutil;
+package com.baeldung.cucumber.tags.acceptance.commonutil;
import io.restassured.http.ContentType;
import io.restassured.module.mockmvc.response.MockMvcResponse;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextUI.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextUI.java
similarity index 97%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextUI.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextUI.java
index b332ceb3b4..66aabece11 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioContextUI.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioContextUI.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.commonutil;
+package com.baeldung.cucumber.tags.acceptance.commonutil;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioHooks.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioHooks.java
similarity index 96%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioHooks.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioHooks.java
index cf44310fa8..397ea7eef8 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioHooks.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioHooks.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.commonutil;
+package com.baeldung.cucumber.tags.acceptance.commonutil;
import io.cucumber.java.After;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioReport.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioReport.java
similarity index 95%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioReport.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioReport.java
index 58ad44de89..093a4bf5b1 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/commonutil/ScenarioReport.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/commonutil/ScenarioReport.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.commonutil;
+package com.baeldung.cucumber.tags.acceptance.commonutil;
import io.cucumber.java.Scenario;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/Page.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/Page.java
similarity index 93%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/Page.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/Page.java
index 5ee9556c28..7d09573ce7 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/Page.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/Page.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.ui.pages;
+package com.baeldung.cucumber.tags.acceptance.ui.pages;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.WebDriverWait;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/RandomNumberGeneratorPage.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/RandomNumberGeneratorPage.java
similarity index 93%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/RandomNumberGeneratorPage.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/RandomNumberGeneratorPage.java
index 24e4748313..be0d409a19 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/pages/RandomNumberGeneratorPage.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/pages/RandomNumberGeneratorPage.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.acceptance.ui.pages;
+package com.baeldung.cucumber.tags.acceptance.ui.pages;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java
similarity index 86%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java
index d7856c4c5e..0cefca97f3 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/acceptance/ui/steps/RandomNumberGeneratorSteps.java
@@ -1,7 +1,7 @@
-package com.baeldung.cucumber_tags.acceptance.ui.steps;
+package com.baeldung.cucumber.tags.acceptance.ui.steps;
-import com.baeldung.cucumber_tags.acceptance.commonutil.ScenarioContextUI;
-import com.baeldung.cucumber_tags.acceptance.ui.pages.RandomNumberGeneratorPage;
+import com.baeldung.cucumber.tags.acceptance.commonutil.ScenarioContextUI;
+import com.baeldung.cucumber.tags.acceptance.ui.pages.RandomNumberGeneratorPage;
import io.cucumber.java.en.And;
import io.cucumber.java.en.Given;
import io.cucumber.java.en.Then;
@@ -9,7 +9,7 @@ import io.cucumber.java.en.When;
import org.openqa.selenium.support.PageFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import static com.baeldung.cucumber_tags.acceptance.ui.pages.Page.getPage;
+import static com.baeldung.cucumber.tags.acceptance.ui.pages.Page.getPage;
import static org.junit.Assert.assertTrue;
public class RandomNumberGeneratorSteps {
diff --git a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorServiceUnitTest.java b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorServiceUnitTest.java
similarity index 90%
rename from testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorServiceUnitTest.java
rename to testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorServiceUnitTest.java
index 7adbffba0c..57c593f6be 100644
--- a/testing-modules/cucumber/src/test/java/com/baeldung/cucumber_tags/service/RandomNumberGeneratorServiceUnitTest.java
+++ b/testing-modules/cucumber/src/test/java/com/baeldung/cucumber/tags/service/RandomNumberGeneratorServiceUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.cucumber_tags.service;
+package com.baeldung.cucumber.tags.service;
import org.junit.jupiter.api.Test;
diff --git a/testing-modules/cucumber/src/test/resources/com/baeldung/cucumber_tags/acceptance/api/health.feature b/testing-modules/cucumber/src/test/resources/com/baeldung/cucumber/tags/acceptance/api/health.feature
similarity index 100%
rename from testing-modules/cucumber/src/test/resources/com/baeldung/cucumber_tags/acceptance/api/health.feature
rename to testing-modules/cucumber/src/test/resources/com/baeldung/cucumber/tags/acceptance/api/health.feature
diff --git a/testing-modules/cucumber/src/test/resources/com/baeldung/cucumber_tags/acceptance/ui/random-number.feature b/testing-modules/cucumber/src/test/resources/com/baeldung/cucumber/tags/acceptance/ui/random-number.feature
similarity index 100%
rename from testing-modules/cucumber/src/test/resources/com/baeldung/cucumber_tags/acceptance/ui/random-number.feature
rename to testing-modules/cucumber/src/test/resources/com/baeldung/cucumber/tags/acceptance/ui/random-number.feature