diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
index e45e1780e..4589e8d18 100644
--- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
@@ -7,6 +7,7 @@
 import school.redrover.ui.component.BaseComponent;
 import school.redrover.ui.page.BaseProjectConfigurationPage;
 import school.redrover.ui.page.BaseProjectStatusPage;
+import school.redrover.ui.page.ProjectMovePage;
 import school.redrover.ui.page.ProjectRenamingPage;
 
 import java.util.function.Function;
@@ -72,7 +73,7 @@ public ProjectMovePage<ProjectStatusPage> clickSidebarMove() {
     public ProjectRenamingPage<ProjectStatusPage> clickSidebarRename() {
         renameMenuItem.click();
 
-        return new ProjectRenamingPage<>(getDriver(), projectStatusPageFactory);
+        return new ProjectRenamingPage<>(getDriver(), projectStatusPageFactory).waitUntilPageLoadJS();
     }
 
 
diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
index 4df7c999b..839db4640 100644
--- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
@@ -12,8 +12,7 @@
 
 public class PipelineProjectSidebar extends BaseSidebarComponent<PipelineProjectSidebar, PipelineProjectStatusPage,
         PipelineProjectConfigurationPage>
-        implements SidebarChangesTrait<PipelineProjectChangesPage>,
-        SidebarBuildNowTrait<PipelineProjectStatusPage>,
+        implements SidebarChangesTrait<PipelineProjectChangesPage>, SidebarBuildNowTrait<PipelineProjectStatusPage>,
         SidebarCredentialsTrait<PipelineProjectCredentialsPage> {
 
     public PipelineProjectSidebar(WebDriver driver) {
@@ -44,5 +43,4 @@ public PipelineProjectChangesPage getProjectChangesPage() {
     public PipelineProjectCredentialsPage getProjectCredentialsPage() {
         return new PipelineProjectCredentialsPage(getDriver());
     }
-
 }
diff --git a/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
index 20e2c4cd0..4b7f106ca 100644
--- a/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
+++ b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
@@ -7,9 +7,9 @@
 
 import java.util.function.Function;
 
-public class ProjectRenamingPage<T extends BasePage<T>> extends BasePage<ProjectRenamingPage<?>> {
 
-    private final Function<WebDriver, T> projectStatusPageFactory;
+public class ProjectRenamingPage<ProjectStatusPage extends BaseProjectStatusPage<ProjectStatusPage, ?>>
+        extends BasePage<ProjectRenamingPage<ProjectStatusPage>> {
 
     @FindBy(name = "newName")
     private WebElement newNameField;
@@ -17,29 +17,32 @@ public class ProjectRenamingPage<T extends BasePage<T>> extends BasePage<Project
     @FindBy(name = "Submit")
     private WebElement renameButton;
 
-    public ProjectRenamingPage(WebDriver driver, Function<WebDriver, T> projectStatusPageFactory) {
+    private final Function<WebDriver, ProjectStatusPage> projectStatusPageFactory;
+
+
+    public ProjectRenamingPage(WebDriver driver, Function<WebDriver, ProjectStatusPage> projectStatusPageFactory) {
         super(driver);
         this.projectStatusPageFactory = projectStatusPageFactory;
     }
 
     @Override
-    public ProjectRenamingPage<T> getPage() {
+    public ProjectRenamingPage<ProjectStatusPage> getPage() {
         return this;
     }
 
-    public ProjectRenamingPage<T> sendNewName(String newName) {
+    public ProjectRenamingPage<ProjectStatusPage> sendNewName(String newName) {
         newNameField.sendKeys(newName);
 
         return this;
     }
 
-    public ProjectRenamingPage<T> clearName() {
+    public ProjectRenamingPage<ProjectStatusPage> clearName() {
         newNameField.clear();
 
         return this;
     }
 
-    public T clickRenameButton() {
+    public ProjectStatusPage clickRenameButton() {
         renameButton.click();
 
         return projectStatusPageFactory.apply(getDriver()).waitUntilPageLoadJS();