diff --git a/Kontent.Ai.Management.Helpers/EditLinkBuilder.cs b/Kontent.Ai.Management.Helpers/EditLinkBuilder.cs
index 8d668c7e..c4630049 100644
--- a/Kontent.Ai.Management.Helpers/EditLinkBuilder.cs
+++ b/Kontent.Ai.Management.Helpers/EditLinkBuilder.cs
@@ -33,7 +33,7 @@ private ManagementHelpersOptions ManagementHelpersOptions
     /// <summary>
     /// Initializes a new instance of the <see cref="EditLinkBuilder"/> class for retrieving edit urls.
     /// </summary>
-    /// <param name="managementHelpersOptions">The settings of the Kontent.ai project.</param>
+    /// <param name="managementHelpersOptions">The settings of the Kontent.ai environment.</param>
     public EditLinkBuilder(ManagementHelpersOptions managementHelpersOptions)
     {
         if (string.IsNullOrEmpty(managementHelpersOptions.AdminUrl))
@@ -43,12 +43,12 @@ public EditLinkBuilder(ManagementHelpersOptions managementHelpersOptions)
 
         if (string.IsNullOrEmpty(managementHelpersOptions.EnvironmentId))
         {
-            throw new ArgumentException("Kontent.ai project identifier is not specified.", nameof(managementHelpersOptions.EnvironmentId));
+            throw new ArgumentException("Kontent.ai environment identifier is not specified.", nameof(managementHelpersOptions.EnvironmentId));
         }
 
         if (!Guid.TryParse(managementHelpersOptions.EnvironmentId, out _))
         {
-            throw new ArgumentException($"Provided string is not a valid project identifier ({managementHelpersOptions.EnvironmentId}).", nameof(managementHelpersOptions.EnvironmentId));
+            throw new ArgumentException($"Provided string is not a valid environment identifier ({managementHelpersOptions.EnvironmentId}).", nameof(managementHelpersOptions.EnvironmentId));
         }
 
         ManagementHelpersOptions = managementHelpersOptions;
@@ -57,7 +57,7 @@ public EditLinkBuilder(ManagementHelpersOptions managementHelpersOptions)
     /// <summary>
     /// Initializes a new instance of the <see cref="EditLinkBuilder"/> class for retrieving edit urls.
     /// </summary>
-    /// <param name="managementHelpersOptions">The settings of the Kontent.ai project.</param>
+    /// <param name="managementHelpersOptions">The settings of the Kontent.ai environment.</param>
     public EditLinkBuilder(IOptionsMonitor<ManagementHelpersOptions> managementHelpersOptions)
     {
         managementHelpersOptionsMonitor = managementHelpersOptions;
diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/ProjectInformationTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentInformationTests.cs
similarity index 100%
rename from Kontent.Ai.Management.Tests/ManagementClientTests/ProjectInformationTests.cs
rename to Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentInformationTests.cs
diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/ProjectRoleTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentRoleTests.cs
similarity index 100%
rename from Kontent.Ai.Management.Tests/ManagementClientTests/ProjectRoleTests.cs
rename to Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentRoleTests.cs
diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/ProjectUserTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentUserTests.cs
similarity index 97%
rename from Kontent.Ai.Management.Tests/ManagementClientTests/ProjectUserTests.cs
rename to Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentUserTests.cs
index 1a44ed8c..936d2457 100644
--- a/Kontent.Ai.Management.Tests/ManagementClientTests/ProjectUserTests.cs
+++ b/Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentUserTests.cs
@@ -10,11 +10,11 @@
 
 namespace Kontent.Ai.Management.Tests.ManagementClientTests;
 
-public class ProjectUserTests : IClassFixture<FileSystemFixture>
+public class EnvironmentUserTests : IClassFixture<FileSystemFixture>
 {
     private readonly Scenario _scenario;
 
-    public ProjectUserTests()
+    public EnvironmentUserTests()
     {
         _scenario = new Scenario(folder: "ProjectUser");
     }
diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/ProjectValidationTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentValidationTests.cs
similarity index 100%
rename from Kontent.Ai.Management.Tests/ManagementClientTests/ProjectValidationTests.cs
rename to Kontent.Ai.Management.Tests/ManagementClientTests/EnvironmentValidationTests.cs
diff --git a/Kontent.Ai.Management.Tests/Modules/UrlBuilder/ProjectRoleTests.cs b/Kontent.Ai.Management.Tests/Modules/UrlBuilder/ProjectRoleTests.cs
index 6435fd1b..853b84dc 100644
--- a/Kontent.Ai.Management.Tests/Modules/UrlBuilder/ProjectRoleTests.cs
+++ b/Kontent.Ai.Management.Tests/Modules/UrlBuilder/ProjectRoleTests.cs
@@ -7,7 +7,7 @@ namespace Kontent.Ai.Management.Tests.Modules.UrlBuilder;
 public partial class EndpointUrlBuilderTests
 {
     [Fact]
-    public void BuildProjectRolesUrl_ReturnsCorrectUrl()
+    public void BuildEnvironmentRolesUrl_ReturnsCorrectUrl()
     {
         var actualUrl = _builder.BuildEnvironmentRolesUrl();
         var expectedUrl = $"{ENDPOINT}/projects/{ENVIRONMENT_ID}/roles";
@@ -16,7 +16,7 @@ public void BuildProjectRolesUrl_ReturnsCorrectUrl()
     }
 
     [Fact]
-    public void BuildProjectRoleUrl_WithId_ReturnsCorrectUrl()
+    public void BuildEnvironmentRoleUrl_WithId_ReturnsCorrectUrl()
     {
         var roleIdentifier = Reference.ById(Guid.NewGuid());
         var actualUrl = _builder.BuildEnvironmentRoleUrl(roleIdentifier);
@@ -26,7 +26,7 @@ public void BuildProjectRoleUrl_WithId_ReturnsCorrectUrl()
     }
 
     [Fact]
-    public void BuildProjectRoleUrl_WithCodename_ReturnsCorrectUrl()
+    public void BuildEnvironmentRoleUrl_WithCodename_ReturnsCorrectUrl()
     {
         var roleIdentifier = Reference.ByCodename("codename");
         var actualUrl = _builder.BuildEnvironmentRoleUrl(roleIdentifier);
@@ -36,7 +36,7 @@ public void BuildProjectRoleUrl_WithCodename_ReturnsCorrectUrl()
     }
 
     [Fact]
-    public void BuildProjectRoleUrl_WithExternalId_Throws()
+    public void BuildEnvironmentRoleUrl_WithExternalId_Throws()
     {
         var roleIdentifier = Reference.ByExternalId("external");
         Assert.Throws<InvalidOperationException>(() => _builder.BuildEnvironmentRoleUrl(roleIdentifier));
diff --git a/Kontent.Ai.Management/Extensions/ListingExtensions.cs b/Kontent.Ai.Management/Extensions/ListingExtensions.cs
index a6dd2f4d..22dd139a 100644
--- a/Kontent.Ai.Management/Extensions/ListingExtensions.cs
+++ b/Kontent.Ai.Management/Extensions/ListingExtensions.cs
@@ -17,7 +17,7 @@ public static class ListingExtensions
     /// </summary>
     /// <typeparam name="T">Entity model e.g <see cref="LanguageModel"/>, <see cref="TaxonomyGroupModel"/> and etc.</typeparam>
     /// <param name="method">To be extended method that returns <see cref="Task{IListingResponseModel}"/></param>
-    /// <returns><see cref="List{T}"/> all items for project</returns>
+    /// <returns><see cref="List{T}"/> all items for environment</returns>
     public async static Task<List<T>> GetAllAsync<T>(this Task<IListingResponseModel<T>> method)
     {
         var result = new List<T>();
diff --git a/Kontent.Ai.Management/Models/ProjectReport/ElementIssue.cs b/Kontent.Ai.Management/Models/EnvironmentReport/ElementIssue.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectReport/ElementIssue.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/ElementIssue.cs
diff --git a/Kontent.Ai.Management/Models/ProjectReport/Project.cs b/Kontent.Ai.Management/Models/EnvironmentReport/Environment.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectReport/Project.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/Environment.cs
diff --git a/Kontent.Ai.Management/Models/ProjectReport/ProjectReportModel.cs b/Kontent.Ai.Management/Models/EnvironmentReport/EnvironmentReportModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectReport/ProjectReportModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/EnvironmentReportModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectReport/Metadata.cs b/Kontent.Ai.Management/Models/EnvironmentReport/Metadata.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectReport/Metadata.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/Metadata.cs
diff --git a/Kontent.Ai.Management/Models/ProjectReport/TypeIssues.cs b/Kontent.Ai.Management/Models/EnvironmentReport/TypeIssues.cs
similarity index 90%
rename from Kontent.Ai.Management/Models/ProjectReport/TypeIssues.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/TypeIssues.cs
index 03571e38..2a17143c 100644
--- a/Kontent.Ai.Management/Models/ProjectReport/TypeIssues.cs
+++ b/Kontent.Ai.Management/Models/EnvironmentReport/TypeIssues.cs
@@ -15,7 +15,7 @@ public class TypeIssue
     public Metadata Type { get; set; }
 
     /// <summary>
-    /// Gets or sets information about project language
+    /// Gets or sets information about environment language
     /// </summary>
     [JsonProperty("issues")]
     public IEnumerable<ElementIssue> Issues { get; set; }
diff --git a/Kontent.Ai.Management/Models/ProjectReport/VariantIssue.cs b/Kontent.Ai.Management/Models/EnvironmentReport/VariantIssue.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectReport/VariantIssue.cs
rename to Kontent.Ai.Management/Models/EnvironmentReport/VariantIssue.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssueModel.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssueModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssueModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssueModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssueType.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssueType.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssueType.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssueType.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssuesResponseServerModel.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssuesResponseServerModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskIssuesResponseServerModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskIssuesResponseServerModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskModel.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskResult.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskResult.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskResult.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskResult.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskStatus.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskStatus.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskStatus.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskStatus.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskTypeIssueModel.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskTypeIssueModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskTypeIssueModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskTypeIssueModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskVariantIssueModel.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskVariantIssueModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/AsyncValidationTaskVariantIssueModel.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/AsyncValidationTaskVariantIssueModel.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/ElementIssue.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/ElementIssue.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/ElementIssue.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/ElementIssue.cs
diff --git a/Kontent.Ai.Management/Models/ProjectValidation/Metadata.cs b/Kontent.Ai.Management/Models/EnvironmentValidation/Metadata.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/ProjectValidation/Metadata.cs
rename to Kontent.Ai.Management/Models/EnvironmentValidation/Metadata.cs
diff --git a/Kontent.Ai.Management/Models/Roles/ProjectRoleModel.cs b/Kontent.Ai.Management/Models/Roles/EnvironmentRoleModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/Roles/ProjectRoleModel.cs
rename to Kontent.Ai.Management/Models/Roles/EnvironmentRoleModel.cs
diff --git a/Kontent.Ai.Management/Models/Roles/ProjectRolesModel.cs b/Kontent.Ai.Management/Models/Roles/EnvironmentRolesModel.cs
similarity index 100%
rename from Kontent.Ai.Management/Models/Roles/ProjectRolesModel.cs
rename to Kontent.Ai.Management/Models/Roles/EnvironmentRolesModel.cs
diff --git a/Kontent.Ai.Management/Models/Subscription/SubscriptionProjectModel.cs b/Kontent.Ai.Management/Models/Subscription/SubscriptionProjectModel.cs
index 73aeb9ea..ff35334e 100644
--- a/Kontent.Ai.Management/Models/Subscription/SubscriptionProjectModel.cs
+++ b/Kontent.Ai.Management/Models/Subscription/SubscriptionProjectModel.cs
@@ -31,5 +31,5 @@ public sealed class SubscriptionProjectModel
     /// Gets or sets the project's environments.
     /// </summary>
     [JsonProperty("environments")]
-    public IEnumerable<SubscriptionProjectEnvironmentModel> Environmnets { get; set; }
+    public IEnumerable<SubscriptionProjectEnvironmentModel> Environments { get; set; }
 }
diff --git a/Kontent.Ai.Management/Modules/UrlBuilder/Templates/ProjectRolesTemplate.cs b/Kontent.Ai.Management/Modules/UrlBuilder/Templates/EnvironmentRolesTemplate.cs
similarity index 100%
rename from Kontent.Ai.Management/Modules/UrlBuilder/Templates/ProjectRolesTemplate.cs
rename to Kontent.Ai.Management/Modules/UrlBuilder/Templates/EnvironmentRolesTemplate.cs