diff --git a/Directory.Build.props b/Directory.Build.props
index 79b1b1640..9a87e6582 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,4 +36,9 @@
$(NoWarn);IL2026;IL2046;IL2057;IL2067;IL2070;IL2072;IL2075;IL2087;IL2091
+
+
+ 3.6.0-preview.1018
+ 3.6.0-preview.28
+
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 840b7cf12..1a8054f2b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,6 +3,26 @@
true
true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11,7 +31,7 @@
-
+
@@ -23,21 +43,17 @@
-
+
-
-
-
-
-
-
-
+
+
+
@@ -45,7 +61,7 @@
-
+
@@ -108,11 +124,11 @@
-
+
-
-
+
+
@@ -125,38 +141,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Elsa.sln b/Elsa.sln
index 864a2eb11..151d71f25 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -81,7 +81,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Api.Client", "src\clie
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Environments", "src\modules\Elsa.Environments\Elsa.Environments.csproj", "{B5CDF747-8066-40D5-9BAE-CBE397BC9B51}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripting", "scripting", "{6EF07978-A6D2-40EB-891D-7D70C5F37E76}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "expressions", "expressions", "{6EF07978-A6D2-40EB-891D-7D70C5F37E76}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "security", "security", "{5948B0A5-7873-4DBB-BA03-EB283D6EA91B}"
EndProject
@@ -254,6 +254,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "caching", "caching", "{02EA
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Caching", "src\modules\Elsa.Caching\Elsa.Caching.csproj", "{6F14B066-DF7B-2409-59D8-CCCA90A4974C}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{C55015F0-E9DF-4BF9-8131-D7539E938220}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Http", "src\modules\Elsa.Http\Elsa.Http.csproj", "{E0B22AB7-7CB5-6D17-562C-4A989DC61F8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.CSharp", "src\modules\Elsa.Expressions.CSharp\Elsa.Expressions.CSharp.csproj", "{16C3FBDE-A832-E3CD-5FBF-F51744D1F79B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.Dsl", "src\modules\Elsa.Expressions.Dsl\Elsa.Expressions.Dsl.csproj", "{765392DE-8560-B464-62DD-6890720FF5D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.JavaScript", "src\modules\Elsa.Expressions.JavaScript\Elsa.Expressions.JavaScript.csproj", "{099D5DCE-CCF7-16FE-6EDC-A64B694F50BE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.JavaScript.Libraries", "src\modules\Elsa.Expressions.JavaScript.Libraries\Elsa.Expressions.JavaScript.Libraries.csproj", "{08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.Liquid", "src\modules\Elsa.Expressions.Liquid\Elsa.Expressions.Liquid.csproj", "{6AF53651-99F0-1DE0-D37B-4FF6B0348DBB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Expressions.Python", "src\modules\Elsa.Expressions.Python\Elsa.Expressions.Python.csproj", "{9D8FB664-88B4-10BE-58A2-D9A1644AD2E4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -426,6 +442,34 @@ Global
{6F14B066-DF7B-2409-59D8-CCCA90A4974C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F14B066-DF7B-2409-59D8-CCCA90A4974C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F14B066-DF7B-2409-59D8-CCCA90A4974C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E0B22AB7-7CB5-6D17-562C-4A989DC61F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E0B22AB7-7CB5-6D17-562C-4A989DC61F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E0B22AB7-7CB5-6D17-562C-4A989DC61F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E0B22AB7-7CB5-6D17-562C-4A989DC61F8A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {16C3FBDE-A832-E3CD-5FBF-F51744D1F79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {16C3FBDE-A832-E3CD-5FBF-F51744D1F79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {16C3FBDE-A832-E3CD-5FBF-F51744D1F79B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {16C3FBDE-A832-E3CD-5FBF-F51744D1F79B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {765392DE-8560-B464-62DD-6890720FF5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {765392DE-8560-B464-62DD-6890720FF5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {765392DE-8560-B464-62DD-6890720FF5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {765392DE-8560-B464-62DD-6890720FF5D5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {099D5DCE-CCF7-16FE-6EDC-A64B694F50BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {099D5DCE-CCF7-16FE-6EDC-A64B694F50BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {099D5DCE-CCF7-16FE-6EDC-A64B694F50BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {099D5DCE-CCF7-16FE-6EDC-A64B694F50BE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6AF53651-99F0-1DE0-D37B-4FF6B0348DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6AF53651-99F0-1DE0-D37B-4FF6B0348DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6AF53651-99F0-1DE0-D37B-4FF6B0348DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6AF53651-99F0-1DE0-D37B-4FF6B0348DBB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9D8FB664-88B4-10BE-58A2-D9A1644AD2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9D8FB664-88B4-10BE-58A2-D9A1644AD2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9D8FB664-88B4-10BE-58A2-D9A1644AD2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9D8FB664-88B4-10BE-58A2-D9A1644AD2E4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -499,6 +543,14 @@ Global
{E7137FB0-1988-4562-AD8D-D0D9D2EE85F6} = {CD7DC0D1-FFDC-417A-89BE-7F32408F583E}
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
{6F14B066-DF7B-2409-59D8-CCCA90A4974C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+ {C55015F0-E9DF-4BF9-8131-D7539E938220} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
+ {E0B22AB7-7CB5-6D17-562C-4A989DC61F8A} = {C55015F0-E9DF-4BF9-8131-D7539E938220}
+ {16C3FBDE-A832-E3CD-5FBF-F51744D1F79B} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
+ {765392DE-8560-B464-62DD-6890720FF5D5} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
+ {099D5DCE-CCF7-16FE-6EDC-A64B694F50BE} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
+ {08B69CC4-B5F0-44E8-FA7A-6BF6F00CA40A} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
+ {6AF53651-99F0-1DE0-D37B-4FF6B0348DBB} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
+ {9D8FB664-88B4-10BE-58A2-D9A1644AD2E4} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D4B5CEAA-7D70-4FCB-A68E-B03FBE5E0E5E}
diff --git a/src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharp.cs b/src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharp.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharp.cs
rename to src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharp.cs
index 345e6a71c..fc70a4103 100644
--- a/src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharp.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharp.cs
@@ -1,7 +1,7 @@
using System.Runtime.CompilerServices;
-using Elsa.Scripting.CSharp.Contracts;
-using Elsa.Scripting.CSharp.Extensions;
-using Elsa.Scripting.CSharp.Models;
+using Elsa.Expressions.CSharp.Contracts;
+using Elsa.Expressions.CSharp.Extensions;
+using Elsa.Expressions.CSharp.Models;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Elsa.Workflows;
@@ -10,7 +10,7 @@ using Elsa.Workflows.UIHints;
using Elsa.Workflows.Models;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.CSharp.Activities;
+namespace Elsa.Expressions.CSharp.Activities;
///
/// Executes C# code.
diff --git a/src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs b/src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs
similarity index 86%
rename from src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs
rename to src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs
index e939a07e2..eddb76843 100644
--- a/src/modules/Elsa.Scripting.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Activities/RunCSharp/RunCSharpOptionsProvider.cs
@@ -2,7 +2,7 @@ using System.Reflection;
using Elsa.Workflows.UIHints.CodeEditor;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.CSharp.Activities;
+namespace Elsa.Expressions.CSharp.Activities;
internal class RunCSharpOptionsProvider : CodeEditorOptionsProviderBase
{
diff --git a/src/modules/Elsa.Scripting.CSharp/Contexts/ScriptConfigurationContext.cs b/src/modules/Elsa.Expressions.CSharp/Contexts/ScriptConfigurationContext.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.CSharp/Contexts/ScriptConfigurationContext.cs
rename to src/modules/Elsa.Expressions.CSharp/Contexts/ScriptConfigurationContext.cs
index d79161c96..e01e3c2ff 100644
--- a/src/modules/Elsa.Scripting.CSharp/Contexts/ScriptConfigurationContext.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Contexts/ScriptConfigurationContext.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
using Microsoft.CodeAnalysis.Scripting;
-namespace Elsa.Scripting.CSharp.Contexts;
+namespace Elsa.Expressions.CSharp.Contexts;
///
/// Context for configuring the .
diff --git a/src/modules/Elsa.Scripting.CSharp/Contexts/ScriptOptionsConfigurationContext.cs b/src/modules/Elsa.Expressions.CSharp/Contexts/ScriptOptionsConfigurationContext.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.CSharp/Contexts/ScriptOptionsConfigurationContext.cs
rename to src/modules/Elsa.Expressions.CSharp/Contexts/ScriptOptionsConfigurationContext.cs
index 4b2791901..e99436930 100644
--- a/src/modules/Elsa.Scripting.CSharp/Contexts/ScriptOptionsConfigurationContext.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Contexts/ScriptOptionsConfigurationContext.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
using Microsoft.CodeAnalysis.Scripting;
-namespace Elsa.Scripting.CSharp.Contexts;
+namespace Elsa.Expressions.CSharp.Contexts;
///
/// Context for configuring the .
diff --git a/src/modules/Elsa.Scripting.CSharp/Contracts/ICSharpEvaluator.cs b/src/modules/Elsa.Expressions.CSharp/Contracts/ICSharpEvaluator.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.CSharp/Contracts/ICSharpEvaluator.cs
rename to src/modules/Elsa.Expressions.CSharp/Contracts/ICSharpEvaluator.cs
index 198139155..db53a62f2 100644
--- a/src/modules/Elsa.Scripting.CSharp/Contracts/ICSharpEvaluator.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Contracts/ICSharpEvaluator.cs
@@ -2,7 +2,7 @@
using JetBrains.Annotations;
using Microsoft.CodeAnalysis.Scripting;
-namespace Elsa.Scripting.CSharp.Contracts;
+namespace Elsa.Expressions.CSharp.Contracts;
///
/// Evaluates C# expressions.
diff --git a/src/modules/Elsa.Scripting.CSharp/Elsa.Scripting.CSharp.csproj b/src/modules/Elsa.Expressions.CSharp/Elsa.Expressions.CSharp.csproj
similarity index 100%
rename from src/modules/Elsa.Scripting.CSharp/Elsa.Scripting.CSharp.csproj
rename to src/modules/Elsa.Expressions.CSharp/Elsa.Expressions.CSharp.csproj
diff --git a/src/modules/Elsa.Scripting.CSharp/Expressions/CSharpExpressionHandler.cs b/src/modules/Elsa.Expressions.CSharp/Expressions/CSharpExpressionHandler.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.CSharp/Expressions/CSharpExpressionHandler.cs
rename to src/modules/Elsa.Expressions.CSharp/Expressions/CSharpExpressionHandler.cs
index 941d404f0..706d102de 100644
--- a/src/modules/Elsa.Scripting.CSharp/Expressions/CSharpExpressionHandler.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Expressions/CSharpExpressionHandler.cs
@@ -1,9 +1,9 @@
-using Elsa.Scripting.CSharp.Contracts;
+using Elsa.Expressions.CSharp.Contracts;
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
-namespace Elsa.Scripting.CSharp.Expressions;
+namespace Elsa.Expressions.CSharp.Expressions;
///
/// Evaluates C# expressions.
diff --git a/src/modules/Elsa.Scripting.CSharp/Extensions/CSharpEvaluatorExtensions.cs b/src/modules/Elsa.Expressions.CSharp/Extensions/CSharpEvaluatorExtensions.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.CSharp/Extensions/CSharpEvaluatorExtensions.cs
rename to src/modules/Elsa.Expressions.CSharp/Extensions/CSharpEvaluatorExtensions.cs
index 9a1632b1b..5d4b743ff 100644
--- a/src/modules/Elsa.Scripting.CSharp/Extensions/CSharpEvaluatorExtensions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Extensions/CSharpEvaluatorExtensions.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.CSharp.Contracts;
+using Elsa.Expressions.CSharp.Contracts;
using Elsa.Expressions.Models;
-namespace Elsa.Scripting.CSharp.Extensions;
+namespace Elsa.Expressions.CSharp.Extensions;
///
/// Provides extension methods for .
diff --git a/src/modules/Elsa.Scripting.CSharp/Extensions/ModuleExtensions.cs b/src/modules/Elsa.Expressions.CSharp/Extensions/ModuleExtensions.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.CSharp/Extensions/ModuleExtensions.cs
rename to src/modules/Elsa.Expressions.CSharp/Extensions/ModuleExtensions.cs
index 7e431c05e..247e23575 100644
--- a/src/modules/Elsa.Scripting.CSharp/Extensions/ModuleExtensions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Extensions/ModuleExtensions.cs
@@ -1,5 +1,5 @@
-using Elsa.Scripting.CSharp.Features;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Features;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Features.Services;
// ReSharper disable once CheckNamespace
diff --git a/src/modules/Elsa.Scripting.CSharp/Extensions/VariableNameExtensions.cs b/src/modules/Elsa.Expressions.CSharp/Extensions/VariableNameExtensions.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.CSharp/Extensions/VariableNameExtensions.cs
rename to src/modules/Elsa.Expressions.CSharp/Extensions/VariableNameExtensions.cs
index 75f51897e..38040c333 100644
--- a/src/modules/Elsa.Scripting.CSharp/Extensions/VariableNameExtensions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Extensions/VariableNameExtensions.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.CSharp.Extensions;
+namespace Elsa.Expressions.CSharp.Extensions;
public static class VariableNameExtensions
{
diff --git a/src/modules/Elsa.Scripting.CSharp/Features/CSharpFeature.cs b/src/modules/Elsa.Expressions.CSharp/Features/CSharpFeature.cs
similarity index 84%
rename from src/modules/Elsa.Scripting.CSharp/Features/CSharpFeature.cs
rename to src/modules/Elsa.Expressions.CSharp/Features/CSharpFeature.cs
index 30a38b90b..cd07da4ff 100644
--- a/src/modules/Elsa.Scripting.CSharp/Features/CSharpFeature.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Features/CSharpFeature.cs
@@ -1,10 +1,10 @@
using Elsa.Caching.Features;
using Elsa.Common.Features;
-using Elsa.Scripting.CSharp.Activities;
-using Elsa.Scripting.CSharp.Contracts;
-using Elsa.Scripting.CSharp.Options;
-using Elsa.Scripting.CSharp.Providers;
-using Elsa.Scripting.CSharp.Services;
+using Elsa.Expressions.CSharp.Activities;
+using Elsa.Expressions.CSharp.Contracts;
+using Elsa.Expressions.CSharp.Options;
+using Elsa.Expressions.CSharp.Providers;
+using Elsa.Expressions.CSharp.Services;
using Elsa.Expressions.Features;
using Elsa.Extensions;
using Elsa.Features.Abstractions;
@@ -13,7 +13,7 @@ using Elsa.Features.Services;
using Elsa.Workflows;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.CSharp.Features;
+namespace Elsa.Expressions.CSharp.Features;
///
/// Installs C# integration.
diff --git a/src/modules/Elsa.Scripting.CSharp/FodyWeavers.xml b/src/modules/Elsa.Expressions.CSharp/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.CSharp/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.CSharp/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs b/src/modules/Elsa.Expressions.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs
rename to src/modules/Elsa.Expressions.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs
index f3deb16e4..c8146a0ea 100644
--- a/src/modules/Elsa.Scripting.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Handlers/AddAssembliesAndReferencesFromOptions.cs
@@ -1,11 +1,11 @@
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Mediator.Contracts;
using JetBrains.Annotations;
using Microsoft.CodeAnalysis.Scripting;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Handlers;
+namespace Elsa.Expressions.CSharp.Handlers;
///
/// This handler adds assemblies and namespaces from the to the .
diff --git a/src/modules/Elsa.Scripting.CSharp/Handlers/ConfigureScriptsFromOptions.cs b/src/modules/Elsa.Expressions.CSharp/Handlers/ConfigureScriptsFromOptions.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.CSharp/Handlers/ConfigureScriptsFromOptions.cs
rename to src/modules/Elsa.Expressions.CSharp/Handlers/ConfigureScriptsFromOptions.cs
index 4fb8b0de3..4613bea07 100644
--- a/src/modules/Elsa.Scripting.CSharp/Handlers/ConfigureScriptsFromOptions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Handlers/ConfigureScriptsFromOptions.cs
@@ -1,11 +1,11 @@
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Mediator.Contracts;
using JetBrains.Annotations;
using Microsoft.CodeAnalysis.Scripting;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Handlers;
+namespace Elsa.Expressions.CSharp.Handlers;
///
/// This handler configures the and from the .
diff --git a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateArgumentAccessors.cs b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateArgumentAccessors.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.CSharp/Handlers/GenerateArgumentAccessors.cs
rename to src/modules/Elsa.Expressions.CSharp/Handlers/GenerateArgumentAccessors.cs
index b9a0322e8..207666dfb 100644
--- a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateArgumentAccessors.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateArgumentAccessors.cs
@@ -1,14 +1,14 @@
using System.Text;
-using Elsa.Scripting.CSharp.Extensions;
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Extensions;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Elsa.Mediator.Contracts;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Handlers;
+namespace Elsa.Expressions.CSharp.Handlers;
///
/// Configures the C# evaluator with methods to access workflow variables.
diff --git a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowInputAccessors.cs b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowInputAccessors.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowInputAccessors.cs
rename to src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowInputAccessors.cs
index 51e89d095..48d917237 100644
--- a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowInputAccessors.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowInputAccessors.cs
@@ -1,14 +1,14 @@
using System.Text;
-using Elsa.Scripting.CSharp.Extensions;
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Extensions;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Elsa.Mediator.Contracts;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Handlers;
+namespace Elsa.Expressions.CSharp.Handlers;
///
/// Configures the C# evaluator with methods to access workflow variables.
diff --git a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs
rename to src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs
index c4fd1a6f1..248873d9b 100644
--- a/src/modules/Elsa.Scripting.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Handlers/GenerateWorkflowVariableAccessors.cs
@@ -1,7 +1,7 @@
using System.Text;
-using Elsa.Scripting.CSharp.Extensions;
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Extensions;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Elsa.Mediator.Contracts;
@@ -9,7 +9,7 @@ using Humanizer;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Handlers;
+namespace Elsa.Expressions.CSharp.Handlers;
///
/// Configures the C# evaluator with methods to access workflow variables.
diff --git a/src/modules/Elsa.Scripting.CSharp/Models/ExecutionContextProxy.cs b/src/modules/Elsa.Expressions.CSharp/Models/ExecutionContextProxy.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.CSharp/Models/ExecutionContextProxy.cs
rename to src/modules/Elsa.Expressions.CSharp/Models/ExecutionContextProxy.cs
index d90a5a186..3b0030afc 100644
--- a/src/modules/Elsa.Scripting.CSharp/Models/ExecutionContextProxy.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Models/ExecutionContextProxy.cs
@@ -3,7 +3,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
using JetBrains.Annotations;
-namespace Elsa.Scripting.CSharp.Models;
+namespace Elsa.Expressions.CSharp.Models;
///
/// Provides access to the current execution context.
diff --git a/src/modules/Elsa.Scripting.CSharp/Models/Globals.cs b/src/modules/Elsa.Expressions.CSharp/Models/Globals.cs
similarity index 98%
rename from src/modules/Elsa.Scripting.CSharp/Models/Globals.cs
rename to src/modules/Elsa.Expressions.CSharp/Models/Globals.cs
index f1c10b242..f51d83b37 100644
--- a/src/modules/Elsa.Scripting.CSharp/Models/Globals.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Models/Globals.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
using JetBrains.Annotations;
-namespace Elsa.Scripting.CSharp.Models;
+namespace Elsa.Expressions.CSharp.Models;
///
/// Provides access to global objects, such as the workflow execution context.
diff --git a/src/modules/Elsa.Scripting.CSharp/Models/OutcomeProxy.cs b/src/modules/Elsa.Expressions.CSharp/Models/OutcomeProxy.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.CSharp/Models/OutcomeProxy.cs
rename to src/modules/Elsa.Expressions.CSharp/Models/OutcomeProxy.cs
index d1c475a22..8ce3b5300 100644
--- a/src/modules/Elsa.Scripting.CSharp/Models/OutcomeProxy.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Models/OutcomeProxy.cs
@@ -1,6 +1,6 @@
using Elsa.Expressions.Models;
-namespace Elsa.Scripting.CSharp.Models;
+namespace Elsa.Expressions.CSharp.Models;
///
/// Provides access to activity outcomes.
diff --git a/src/modules/Elsa.Scripting.CSharp/Models/OutputProxy.cs b/src/modules/Elsa.Expressions.CSharp/Models/OutputProxy.cs
similarity index 98%
rename from src/modules/Elsa.Scripting.CSharp/Models/OutputProxy.cs
rename to src/modules/Elsa.Expressions.CSharp/Models/OutputProxy.cs
index 7248fd662..2d2e2ee28 100644
--- a/src/modules/Elsa.Scripting.CSharp/Models/OutputProxy.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Models/OutputProxy.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-namespace Elsa.Scripting.CSharp.Models;
+namespace Elsa.Expressions.CSharp.Models;
///
/// Provides access to activity outputs.
diff --git a/src/modules/Elsa.Scripting.CSharp/Notifications/EvaluatingCSharp.cs b/src/modules/Elsa.Expressions.CSharp/Notifications/EvaluatingCSharp.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.CSharp/Notifications/EvaluatingCSharp.cs
rename to src/modules/Elsa.Expressions.CSharp/Notifications/EvaluatingCSharp.cs
index 25d5aaf1a..3a39b97e1 100644
--- a/src/modules/Elsa.Scripting.CSharp/Notifications/EvaluatingCSharp.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Notifications/EvaluatingCSharp.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Microsoft.CodeAnalysis.Scripting;
-namespace Elsa.Scripting.CSharp.Notifications;
+namespace Elsa.Expressions.CSharp.Notifications;
///
/// This notification is published every time a C# expression is about to be evaluated.
diff --git a/src/modules/Elsa.Scripting.CSharp/Options/CSharpOptions.cs b/src/modules/Elsa.Expressions.CSharp/Options/CSharpOptions.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.CSharp/Options/CSharpOptions.cs
rename to src/modules/Elsa.Expressions.CSharp/Options/CSharpOptions.cs
index b9a842436..b6595a670 100644
--- a/src/modules/Elsa.Scripting.CSharp/Options/CSharpOptions.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Options/CSharpOptions.cs
@@ -2,12 +2,12 @@ using System.Reflection;
using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
-using Elsa.Scripting.CSharp.Contexts;
-using Elsa.Scripting.CSharp.Models;
+using Elsa.Expressions.CSharp.Contexts;
+using Elsa.Expressions.CSharp.Models;
using Elsa.Expressions.Models;
using Microsoft.CodeAnalysis.Scripting;
-namespace Elsa.Scripting.CSharp.Options;
+namespace Elsa.Expressions.CSharp.Options;
///
/// Options for the C# expression evaluator.
@@ -29,7 +29,7 @@ public class CSharpOptions
///
public ISet Assemblies { get; } = new HashSet(new[]
{
- typeof(Globals).Assembly, // Elsa.Scripting.CSharp
+ typeof(Globals).Assembly, // Elsa.Expressions.CSharp
typeof(Enumerable).Assembly, // System.Linq
typeof(Guid).Assembly, // System.Runtime
typeof(JsonSerializer).Assembly, // System.Text.Json
@@ -41,7 +41,7 @@ public class CSharpOptions
///
public ISet Namespaces { get; } = new HashSet(new[]
{
- typeof(Globals).Namespace!, // Elsa.Scripting.CSharp
+ typeof(Globals).Namespace!, // Elsa.Expressions.CSharp
typeof(Enumerable).Namespace!, // System.Linq
typeof(Guid).Namespace!, // System
typeof(JsonSerializer).Namespace!, // System.Text.Json
diff --git a/src/modules/Elsa.Scripting.CSharp/Providers/CSharpExpressionDescriptorProvider.cs b/src/modules/Elsa.Expressions.CSharp/Providers/CSharpExpressionDescriptorProvider.cs
similarity index 87%
rename from src/modules/Elsa.Scripting.CSharp/Providers/CSharpExpressionDescriptorProvider.cs
rename to src/modules/Elsa.Expressions.CSharp/Providers/CSharpExpressionDescriptorProvider.cs
index cd2c64e73..83e11d593 100644
--- a/src/modules/Elsa.Scripting.CSharp/Providers/CSharpExpressionDescriptorProvider.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Providers/CSharpExpressionDescriptorProvider.cs
@@ -1,10 +1,10 @@
-using Elsa.Scripting.CSharp.Expressions;
+using Elsa.Expressions.CSharp.Expressions;
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.CSharp.Providers;
+namespace Elsa.Expressions.CSharp.Providers;
internal class CSharpExpressionDescriptorProvider : IExpressionDescriptorProvider
{
diff --git a/src/modules/Elsa.Scripting.CSharp/Services/CSharpEvaluator.cs b/src/modules/Elsa.Expressions.CSharp/Services/CSharpEvaluator.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.CSharp/Services/CSharpEvaluator.cs
rename to src/modules/Elsa.Expressions.CSharp/Services/CSharpEvaluator.cs
index e2714ce26..a6cfc3e86 100644
--- a/src/modules/Elsa.Scripting.CSharp/Services/CSharpEvaluator.cs
+++ b/src/modules/Elsa.Expressions.CSharp/Services/CSharpEvaluator.cs
@@ -1,9 +1,9 @@
using System.Security.Cryptography;
using System.Text;
-using Elsa.Scripting.CSharp.Contracts;
-using Elsa.Scripting.CSharp.Models;
-using Elsa.Scripting.CSharp.Notifications;
-using Elsa.Scripting.CSharp.Options;
+using Elsa.Expressions.CSharp.Contracts;
+using Elsa.Expressions.CSharp.Models;
+using Elsa.Expressions.CSharp.Notifications;
+using Elsa.Expressions.CSharp.Options;
using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Microsoft.CodeAnalysis;
@@ -12,7 +12,7 @@ using Microsoft.CodeAnalysis.Scripting;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.CSharp.Services;
+namespace Elsa.Expressions.CSharp.Services;
///
/// A C# expression evaluator using Roslyn.
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.cs b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.cs
similarity index 99%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.cs
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.cs
index 40d8a2afc..2e85bf2a6 100644
--- a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Scripting.Dsl/Dsl\ElsaLexer.g4 by ANTLR 4.10.1
+// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Expressions.Dsl/Dsl\ElsaLexer.g4 by ANTLR 4.10.1
// Unreachable code detected
#pragma warning disable 0162
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.interp b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.interp
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.interp
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.interp
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.tokens b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.tokens
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaLexer.tokens
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaLexer.tokens
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.cs b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.cs
similarity index 99%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.cs
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.cs
index a1845d664..995f484bb 100644
--- a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Scripting.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
+// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Expressions.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
// Unreachable code detected
#pragma warning disable 0162
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.interp b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.interp
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.interp
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.interp
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.tokens b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.tokens
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParser.tokens
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParser.tokens
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserBaseVisitor.cs b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserBaseVisitor.cs
similarity index 99%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserBaseVisitor.cs
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserBaseVisitor.cs
index 522c2ad07..d3da69bbb 100644
--- a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserBaseVisitor.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserBaseVisitor.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Scripting.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
+// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Expressions.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
// Unreachable code detected
#pragma warning disable 0162
diff --git a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserVisitor.cs b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserVisitor.cs
similarity index 99%
rename from src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserVisitor.cs
rename to src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserVisitor.cs
index 668e6ce1f..69b1a72f8 100644
--- a/src/modules/Elsa.Scripting.Dsl/Abstractions/ElsaParserVisitor.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Abstractions/ElsaParserVisitor.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Scripting.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
+// Generated from C:/Projects/Elsa/v3/src/dsl/Elsa.Expressions.Dsl/Dsl\ElsaParser.g4 by ANTLR 4.10.1
// Unreachable code detected
#pragma warning disable 0162
diff --git a/src/modules/Elsa.Scripting.Dsl/AssemblyInfo.cs b/src/modules/Elsa.Expressions.Dsl/AssemblyInfo.cs
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/AssemblyInfo.cs
rename to src/modules/Elsa.Expressions.Dsl/AssemblyInfo.cs
diff --git a/src/modules/Elsa.Scripting.Dsl/Contracts/IDslEngine.cs b/src/modules/Elsa.Expressions.Dsl/Contracts/IDslEngine.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.Dsl/Contracts/IDslEngine.cs
rename to src/modules/Elsa.Expressions.Dsl/Contracts/IDslEngine.cs
index 50c9f7441..7a1b18ff3 100644
--- a/src/modules/Elsa.Scripting.Dsl/Contracts/IDslEngine.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Contracts/IDslEngine.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows.Activities;
-namespace Elsa.Scripting.Dsl.Contracts;
+namespace Elsa.Expressions.Dsl.Contracts;
///
/// Represents a DSL engine that parse a workflow definition script into a instance.
diff --git a/src/modules/Elsa.Scripting.Dsl/Contracts/IFunctionActivityRegistry.cs b/src/modules/Elsa.Expressions.Dsl/Contracts/IFunctionActivityRegistry.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Dsl/Contracts/IFunctionActivityRegistry.cs
rename to src/modules/Elsa.Expressions.Dsl/Contracts/IFunctionActivityRegistry.cs
index b32f6057e..3ad592d20 100644
--- a/src/modules/Elsa.Scripting.Dsl/Contracts/IFunctionActivityRegistry.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Contracts/IFunctionActivityRegistry.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.Dsl.Models;
+using Elsa.Expressions.Dsl.Models;
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Contracts;
+namespace Elsa.Expressions.Dsl.Contracts;
///
/// Provides a registry for mapping functions to activities that can be invoked from a DSL script.
diff --git a/src/modules/Elsa.Scripting.Dsl/Contracts/ITypeSystem.cs b/src/modules/Elsa.Expressions.Dsl/Contracts/ITypeSystem.cs
similarity index 79%
rename from src/modules/Elsa.Scripting.Dsl/Contracts/ITypeSystem.cs
rename to src/modules/Elsa.Expressions.Dsl/Contracts/ITypeSystem.cs
index 4d61fbc7b..1fbaf81db 100644
--- a/src/modules/Elsa.Scripting.Dsl/Contracts/ITypeSystem.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Contracts/ITypeSystem.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Contracts;
+namespace Elsa.Expressions.Dsl.Contracts;
public interface ITypeSystem
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/ElsaLexer.g4 b/src/modules/Elsa.Expressions.Dsl/Dsl/ElsaLexer.g4
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/ElsaLexer.g4
rename to src/modules/Elsa.Expressions.Dsl/Dsl/ElsaLexer.g4
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/ElsaParser.g4 b/src/modules/Elsa.Expressions.Dsl/Dsl/ElsaParser.g4
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/ElsaParser.g4
rename to src/modules/Elsa.Expressions.Dsl/Dsl/ElsaParser.g4
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/For.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/For.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/For.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/For.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Full.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Full.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Full.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Full.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Greeting.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Greeting.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Greeting.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Greeting.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HelloGoodbye.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HelloGoodbye.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HelloGoodbye.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HelloGoodbye.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HelloWorld.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HelloWorld.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HelloWorld.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HelloWorld.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HttpTrigger.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HttpTrigger.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/HttpTrigger.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/HttpTrigger.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/If.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/If.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/If.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/If.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Scratchpad.elsa b/src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Scratchpad.elsa
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Dsl/Samples/Scratchpad.elsa
rename to src/modules/Elsa.Expressions.Dsl/Dsl/Samples/Scratchpad.elsa
diff --git a/src/modules/Elsa.Scripting.Dsl/Elsa.Scripting.Dsl.csproj b/src/modules/Elsa.Expressions.Dsl/Elsa.Expressions.Dsl.csproj
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Elsa.Scripting.Dsl.csproj
rename to src/modules/Elsa.Expressions.Dsl/Elsa.Expressions.Dsl.csproj
diff --git a/src/modules/Elsa.Scripting.Dsl/Elsa.Scripting.Dsl.csproj.DotSettings b/src/modules/Elsa.Expressions.Dsl/Elsa.Expressions.Dsl.csproj.DotSettings
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Elsa.Scripting.Dsl.csproj.DotSettings
rename to src/modules/Elsa.Expressions.Dsl/Elsa.Expressions.Dsl.csproj.DotSettings
diff --git a/src/modules/Elsa.Scripting.Dsl/Extensions/DependencyInjectionExtensions.cs b/src/modules/Elsa.Expressions.Dsl/Extensions/DependencyInjectionExtensions.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.Dsl/Extensions/DependencyInjectionExtensions.cs
rename to src/modules/Elsa.Expressions.Dsl/Extensions/DependencyInjectionExtensions.cs
index eb8b5c02c..6f4c195be 100644
--- a/src/modules/Elsa.Scripting.Dsl/Extensions/DependencyInjectionExtensions.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Extensions/DependencyInjectionExtensions.cs
@@ -1,4 +1,4 @@
-using Elsa.Scripting.Dsl.Features;
+using Elsa.Expressions.Dsl.Features;
using Elsa.Features.Services;
// ReSharper disable once CheckNamespace
diff --git a/src/modules/Elsa.Scripting.Dsl/Extensions/ListConverter.cs b/src/modules/Elsa.Expressions.Dsl/Extensions/ListConverter.cs
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/Extensions/ListConverter.cs
rename to src/modules/Elsa.Expressions.Dsl/Extensions/ListConverter.cs
diff --git a/src/modules/Elsa.Scripting.Dsl/Extensions/TypeSystemExtensions.cs b/src/modules/Elsa.Expressions.Dsl/Extensions/TypeSystemExtensions.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.Dsl/Extensions/TypeSystemExtensions.cs
rename to src/modules/Elsa.Expressions.Dsl/Extensions/TypeSystemExtensions.cs
index 3e5a6e27e..76736f182 100644
--- a/src/modules/Elsa.Scripting.Dsl/Extensions/TypeSystemExtensions.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Extensions/TypeSystemExtensions.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Contracts;
using Elsa.Workflows;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Extensions;
+namespace Elsa.Expressions.Dsl.Extensions;
public static class TypeSystemExtensions
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Features/DslFeature.cs b/src/modules/Elsa.Expressions.Dsl/Features/DslFeature.cs
similarity index 83%
rename from src/modules/Elsa.Scripting.Dsl/Features/DslFeature.cs
rename to src/modules/Elsa.Expressions.Dsl/Features/DslFeature.cs
index 14f9a65c2..d0086e1dc 100644
--- a/src/modules/Elsa.Scripting.Dsl/Features/DslFeature.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Features/DslFeature.cs
@@ -1,12 +1,12 @@
-using Elsa.Scripting.Dsl.Contracts;
-using Elsa.Scripting.Dsl.Services;
+using Elsa.Expressions.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Services;
using Elsa.Expressions.Features;
using Elsa.Features.Abstractions;
using Elsa.Features.Attributes;
using Elsa.Features.Services;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.Dsl.Features;
+namespace Elsa.Expressions.Dsl.Features;
///
[DependsOn(typeof(ExpressionsFeature))]
diff --git a/src/modules/Elsa.Scripting.Dsl/FodyWeavers.xml b/src/modules/Elsa.Expressions.Dsl/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.Dsl/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.Dsl/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs
index df2388bde..608b00861 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitArgs.cs
@@ -1,7 +1,7 @@
using Antlr4.Runtime.Tree;
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs
index fca5ffae3..2a0c42ff1 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBlockStatement.cs
@@ -1,7 +1,7 @@
using Elsa.Workflows;
using Elsa.Workflows.Activities;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs
index ba3e39b07..147e16af7 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitBrackets.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Helpers;
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
index 71367125a..78f6d67e6 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs
index 3f2820d7a..439c28cee 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFile.cs
@@ -1,7 +1,7 @@
using Elsa.Workflows;
using Elsa.Workflows.Activities;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
///
public partial class WorkflowDefinitionBuilderInterpreter
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs
index e5c2d5e8a..aebb95c77 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitFunction.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
index f162bad89..44d4779a5 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs
similarity index 87%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs
index 4a1b75a3d..df638711a 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitLocalVariable.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.Dsl.Models;
+using Elsa.Expressions.Dsl.Models;
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs
index 62095280d..fe2102216 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitNewObject.cs
@@ -1,7 +1,7 @@
using Elsa.Workflows;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs
similarity index 98%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs
index 0379d0319..d3a02c98b 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitObject.cs
@@ -2,7 +2,7 @@
using Elsa.Workflows;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs
similarity index 98%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs
index 10110613e..63e7fe49e 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitProperty.cs
@@ -4,7 +4,7 @@ using Elsa.Expressions.Models;
using Elsa.Workflows;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs
index c56229bec..4d28c01a0 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitStringValue.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs
index 86bd1420e..330f9e446 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitWorkflowVariable.cs
@@ -1,7 +1,7 @@
using Elsa.Workflows;
using Elsa.Workflows.Memory;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs
rename to src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs
index b123c0e65..0a718a863 100644
--- a/src/modules/Elsa.Scripting.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/WorkflowDefinitionBuilderInterpreter.cs
@@ -1,10 +1,10 @@
using Antlr4.Runtime.Tree;
-using Elsa.Scripting.Dsl.Contracts;
-using Elsa.Scripting.Dsl.Models;
+using Elsa.Expressions.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Models;
using Elsa.Workflows;
using Elsa.Workflows.Activities;
-namespace Elsa.Scripting.Dsl.Interpreters;
+namespace Elsa.Expressions.Dsl.Interpreters;
public partial class WorkflowDefinitionBuilderInterpreter : ElsaParserBaseVisitor
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Models/DefinedVariable.cs b/src/modules/Elsa.Expressions.Dsl/Models/DefinedVariable.cs
similarity index 81%
rename from src/modules/Elsa.Scripting.Dsl/Models/DefinedVariable.cs
rename to src/modules/Elsa.Expressions.Dsl/Models/DefinedVariable.cs
index 010c5658a..bdae72ad1 100644
--- a/src/modules/Elsa.Scripting.Dsl/Models/DefinedVariable.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Models/DefinedVariable.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.Dsl.Models;
+namespace Elsa.Expressions.Dsl.Models;
public class DefinedVariable
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Models/FunctionActivityDescriptor.cs b/src/modules/Elsa.Expressions.Dsl/Models/FunctionActivityDescriptor.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.Dsl/Models/FunctionActivityDescriptor.cs
rename to src/modules/Elsa.Expressions.Dsl/Models/FunctionActivityDescriptor.cs
index 442b7f0de..c96d5d5fb 100644
--- a/src/modules/Elsa.Scripting.Dsl/Models/FunctionActivityDescriptor.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Models/FunctionActivityDescriptor.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows;
-namespace Elsa.Scripting.Dsl.Models;
+namespace Elsa.Expressions.Dsl.Models;
///
/// Describes a function that is mapped to an activity that can be invoked from a DSL script.
diff --git a/src/modules/Elsa.Scripting.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs b/src/modules/Elsa.Expressions.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs
similarity index 58%
rename from src/modules/Elsa.Scripting.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs
rename to src/modules/Elsa.Expressions.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs
index aa88a20f8..242565579 100644
--- a/src/modules/Elsa.Scripting.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Models/WorkflowDefinitionInterpreterSettings.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.Dsl.Models;
+namespace Elsa.Expressions.Dsl.Models;
public class WorkflowDefinitionInterpreterSettings
{
diff --git a/src/modules/Elsa.Scripting.Dsl/Services/DslEngine.cs b/src/modules/Elsa.Expressions.Dsl/Services/DslEngine.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.Dsl/Services/DslEngine.cs
rename to src/modules/Elsa.Expressions.Dsl/Services/DslEngine.cs
index c0ee33917..cff89cd11 100644
--- a/src/modules/Elsa.Scripting.Dsl/Services/DslEngine.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Services/DslEngine.cs
@@ -1,10 +1,10 @@
using Antlr4.Runtime;
-using Elsa.Scripting.Dsl.Contracts;
-using Elsa.Scripting.Dsl.Interpreters;
+using Elsa.Expressions.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Interpreters;
using Elsa.Workflows;
using Elsa.Workflows.Activities;
-namespace Elsa.Scripting.Dsl.Services;
+namespace Elsa.Expressions.Dsl.Services;
///
public class DslEngine : IDslEngine
diff --git a/src/modules/Elsa.Scripting.Dsl/Services/FunctionActivityRegistry.cs b/src/modules/Elsa.Expressions.Dsl/Services/FunctionActivityRegistry.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Dsl/Services/FunctionActivityRegistry.cs
rename to src/modules/Elsa.Expressions.Dsl/Services/FunctionActivityRegistry.cs
index 03ba4b2a3..81d09d64d 100644
--- a/src/modules/Elsa.Scripting.Dsl/Services/FunctionActivityRegistry.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Services/FunctionActivityRegistry.cs
@@ -1,13 +1,13 @@
using System.Text.Json;
-using Elsa.Scripting.Dsl.Contracts;
-using Elsa.Scripting.Dsl.Interpreters;
-using Elsa.Scripting.Dsl.Models;
+using Elsa.Expressions.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Interpreters;
+using Elsa.Expressions.Dsl.Models;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
using Elsa.Workflows;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Services;
+namespace Elsa.Expressions.Dsl.Services;
///
public class FunctionActivityRegistry : IFunctionActivityRegistry
diff --git a/src/modules/Elsa.Scripting.Dsl/Services/TypeSystem.cs b/src/modules/Elsa.Expressions.Dsl/Services/TypeSystem.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.Dsl/Services/TypeSystem.cs
rename to src/modules/Elsa.Expressions.Dsl/Services/TypeSystem.cs
index 7319b8eeb..fdc873ece 100644
--- a/src/modules/Elsa.Scripting.Dsl/Services/TypeSystem.cs
+++ b/src/modules/Elsa.Expressions.Dsl/Services/TypeSystem.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.Dsl.Contracts;
+using Elsa.Expressions.Dsl.Contracts;
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.Dsl.Services;
+namespace Elsa.Expressions.Dsl.Services;
public class TypeSystem : ITypeSystem
{
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/lodash.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/lodash.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/lodash.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/lodash.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/lodashFp.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/lodashFp.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/lodashFp.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/lodashFp.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/moment.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/moment.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/dist/moment.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/dist/moment.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/package-lock.json b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/package-lock.json
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/package-lock.json
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/package-lock.json
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/package.json b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/package.json
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/package.json
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/package.json
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/lodash.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/lodash.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/lodash.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/lodash.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/lodashFp.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/lodashFp.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/lodashFp.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/lodashFp.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/moment.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/moment.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/src/moment.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/src/moment.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/webpack.config.js b/src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/webpack.config.js
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/ClientLib/webpack.config.js
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/ClientLib/webpack.config.js
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Elsa.Scripting.JavaScript.Libraries.csproj b/src/modules/Elsa.Expressions.JavaScript.Libraries/Elsa.Expressions.JavaScript.Libraries.csproj
similarity index 88%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Elsa.Scripting.JavaScript.Libraries.csproj
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Elsa.Expressions.JavaScript.Libraries.csproj
index 1a0f3dd06..0c404cd1d 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Elsa.Scripting.JavaScript.Libraries.csproj
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Elsa.Expressions.JavaScript.Libraries.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Elsa.Scripting.JavaScript.Libraries.csproj.DotSettings b/src/modules/Elsa.Expressions.JavaScript.Libraries/Elsa.Expressions.JavaScript.Libraries.csproj.DotSettings
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Elsa.Scripting.JavaScript.Libraries.csproj.DotSettings
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Elsa.Expressions.JavaScript.Libraries.csproj.DotSettings
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs b/src/modules/Elsa.Expressions.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs
index 4c4703e32..021588f8f 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Extensions/JavaScriptFeatureExtensions.cs
@@ -1,7 +1,7 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Features;
+using Elsa.Expressions.JavaScript.Features;
-namespace Elsa.Scripting.JavaScript.Libraries.Extensions;
+namespace Elsa.Expressions.JavaScript.Libraries.Extensions;
public static class JavaScriptFeatureExtensions
{
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFeature.cs b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFeature.cs
similarity index 71%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFeature.cs
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFeature.cs
index b242174e8..975869e4a 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFeature.cs
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFeature.cs
@@ -1,5 +1,5 @@
using Elsa.Features.Services;
-namespace Elsa.Scripting.JavaScript.Libraries;
+namespace Elsa.Expressions.JavaScript.Libraries;
public class LodashFeature(IModule module) : ScriptModuleFeatureBase("lodash", module);
\ No newline at end of file
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFpFeature.cs b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFpFeature.cs
similarity index 71%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFpFeature.cs
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFpFeature.cs
index 50f6ecd8b..4c5ccf240 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/LodashFpFeature.cs
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/LodashFpFeature.cs
@@ -1,5 +1,5 @@
using Elsa.Features.Services;
-namespace Elsa.Scripting.JavaScript.Libraries;
+namespace Elsa.Expressions.JavaScript.Libraries;
public class LodashFpFeature(IModule module) : ScriptModuleFeatureBase("lodashFp", module);
\ No newline at end of file
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/MomentFeature.cs b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/MomentFeature.cs
similarity index 70%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Features/MomentFeature.cs
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Features/MomentFeature.cs
index ac5b87e8a..c919d288d 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/MomentFeature.cs
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/MomentFeature.cs
@@ -1,5 +1,5 @@
using Elsa.Features.Services;
-namespace Elsa.Scripting.JavaScript.Libraries;
+namespace Elsa.Expressions.JavaScript.Libraries;
public class MomentFeature(IModule module) : ScriptModuleFeatureBase("moment", module);
\ No newline at end of file
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs
similarity index 78%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs
index 4e1b7141a..47e8432a3 100644
--- a/src/modules/Elsa.Scripting.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs
+++ b/src/modules/Elsa.Expressions.JavaScript.Libraries/Features/ScriptModuleFeatureBase.cs
@@ -3,9 +3,9 @@ using Elsa.Extensions;
using Elsa.Features.Abstractions;
using Elsa.Features.Attributes;
using Elsa.Features.Services;
-using Elsa.Scripting.JavaScript.Features;
+using Elsa.Expressions.JavaScript.Features;
-namespace Elsa.Scripting.JavaScript.Libraries;
+namespace Elsa.Expressions.JavaScript.Libraries;
[DependsOn(typeof(JavaScriptFeature))]
public abstract class ScriptModuleFeatureBase(string moduleName, IModule module) : FeatureBase(module)
@@ -16,7 +16,7 @@ public abstract class ScriptModuleFeatureBase(string moduleName, IModule module)
{
jintOptions.ConfigureEngine((engine, context) =>
{
- var resourceName = $"Elsa.Scripting.JavaScript.Libraries.ClientLib.dist.{moduleName}.js";
+ var resourceName = $"Elsa.Expressions.JavaScript.Libraries.ClientLib.dist.{moduleName}.js";
using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!;
using var reader = new StreamReader(stream);
var script = reader.ReadToEnd();
diff --git a/src/modules/Elsa.Scripting.JavaScript.Libraries/FodyWeavers.xml b/src/modules/Elsa.Expressions.JavaScript.Libraries/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript.Libraries/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.JavaScript.Libraries/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScript.cs b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScript.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScript.cs
rename to src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScript.cs
index a461968a1..3b75500a2 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScript.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScript.cs
@@ -1,7 +1,7 @@
using System.Runtime.CompilerServices;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Contracts;
using Elsa.Workflows;
using Elsa.Workflows.Attributes;
using Elsa.Workflows.Models;
@@ -9,7 +9,7 @@ using Elsa.Workflows.UIHints;
using Jint;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.JavaScript.Activities;
+namespace Elsa.Expressions.JavaScript.Activities;
///
/// Executes JavaScript code.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs
similarity index 85%
rename from src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs
index 2d3326e79..eab72bc6a 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptFunctionsDefinitionProvider.cs
@@ -1,10 +1,10 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using Elsa.Workflows.Helpers;
using JetBrains.Annotations;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.JavaScript.Activities;
+namespace Elsa.Expressions.JavaScript.Activities;
///
/// Produces s for common functions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs
similarity index 85%
rename from src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs
index 42d686605..fc95538f7 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Activities/RunJavaScript/RunJavaScriptOptionsProvider.cs
@@ -2,7 +2,7 @@ using System.Reflection;
using Elsa.Workflows.UIHints.CodeEditor;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.JavaScript.Activities;
+namespace Elsa.Expressions.JavaScript.Activities;
internal class RunJavaScriptOptionsProvider : CodeEditorOptionsProviderBase
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/Contracts/IJavaScriptEvaluator.cs b/src/modules/Elsa.Expressions.JavaScript/Contracts/IJavaScriptEvaluator.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.JavaScript/Contracts/IJavaScriptEvaluator.cs
rename to src/modules/Elsa.Expressions.JavaScript/Contracts/IJavaScriptEvaluator.cs
index c5c6959d8..6357d3c13 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Contracts/IJavaScriptEvaluator.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Contracts/IJavaScriptEvaluator.cs
@@ -2,7 +2,7 @@
using JetBrains.Annotations;
using Jint;
-namespace Elsa.Scripting.JavaScript.Contracts;
+namespace Elsa.Expressions.JavaScript.Contracts;
///
/// Evaluates JavaScript expressions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Contracts/ITypeAliasRegistry.cs b/src/modules/Elsa.Expressions.JavaScript/Contracts/ITypeAliasRegistry.cs
similarity index 88%
rename from src/modules/Elsa.Scripting.JavaScript/Contracts/ITypeAliasRegistry.cs
rename to src/modules/Elsa.Expressions.JavaScript/Contracts/ITypeAliasRegistry.cs
index e3b03efa9..59ce6b57a 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Contracts/ITypeAliasRegistry.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Contracts/ITypeAliasRegistry.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.Contracts;
+namespace Elsa.Expressions.JavaScript.Contracts;
///
/// A central registry of type aliases.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj b/src/modules/Elsa.Expressions.JavaScript/Elsa.Expressions.JavaScript.csproj
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj
rename to src/modules/Elsa.Expressions.JavaScript/Elsa.Expressions.JavaScript.csproj
diff --git a/src/modules/Elsa.Scripting.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs b/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs
rename to src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs
index 2b93b11d0..66f61eaf2 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs
@@ -1,13 +1,13 @@
using System.Text;
using Elsa.Abstractions;
using Elsa.Common.Models;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using Elsa.Workflows.Management;
using Elsa.Workflows.Models;
using JetBrains.Annotations;
-namespace Elsa.Scripting.JavaScript.Endpoints.TypeDefinitions;
+namespace Elsa.Expressions.JavaScript.Endpoints.TypeDefinitions;
///
/// Returns a TypeScript definition that is used by the Monaco editor to display intellisense for JavaScript expressions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionHandler.cs b/src/modules/Elsa.Expressions.JavaScript/Expressions/JavaScriptExpressionHandler.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionHandler.cs
rename to src/modules/Elsa.Expressions.JavaScript/Expressions/JavaScriptExpressionHandler.cs
index b914b523b..9a176c813 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionHandler.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Expressions/JavaScriptExpressionHandler.cs
@@ -2,11 +2,11 @@ using System.Dynamic;
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
-using Elsa.Scripting.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Contracts;
using Humanizer;
using Jint;
-namespace Elsa.Scripting.JavaScript.Expressions;
+namespace Elsa.Expressions.JavaScript.Expressions;
///
/// Evaluates JavaScript expressions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Extensions/DependencyInjectionExtensions.cs b/src/modules/Elsa.Expressions.JavaScript/Extensions/DependencyInjectionExtensions.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.JavaScript/Extensions/DependencyInjectionExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Extensions/DependencyInjectionExtensions.cs
index c95ff1da2..56925112a 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Extensions/DependencyInjectionExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Extensions/DependencyInjectionExtensions.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.JavaScript.Extensions;
+namespace Elsa.Expressions.JavaScript.Extensions;
///
/// Provides extension methods for .
diff --git a/src/modules/Elsa.Scripting.JavaScript/Extensions/EngineExtensions.cs b/src/modules/Elsa.Expressions.JavaScript/Extensions/EngineExtensions.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/Extensions/EngineExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Extensions/EngineExtensions.cs
index b6c841a9f..7d00527aa 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Extensions/EngineExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Extensions/EngineExtensions.cs
@@ -1,5 +1,5 @@
-using Elsa.Scripting.JavaScript.Helpers;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Options;
using Jint;
using Jint.Runtime.Interop;
using Microsoft.Extensions.Options;
diff --git a/src/modules/Elsa.Scripting.JavaScript/Extensions/ModuleExtensions.cs b/src/modules/Elsa.Expressions.JavaScript/Extensions/ModuleExtensions.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.JavaScript/Extensions/ModuleExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Extensions/ModuleExtensions.cs
index f74fb3f1d..6df39f92b 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Extensions/ModuleExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Extensions/ModuleExtensions.cs
@@ -1,6 +1,6 @@
using Elsa.Features.Services;
-using Elsa.Scripting.JavaScript.Features;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Features;
+using Elsa.Expressions.JavaScript.Options;
// ReSharper disable once CheckNamespace
namespace Elsa.Extensions;
diff --git a/src/modules/Elsa.Scripting.JavaScript/Extensions/TypeAliasRegistryExtensions.cs b/src/modules/Elsa.Expressions.JavaScript/Extensions/TypeAliasRegistryExtensions.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.JavaScript/Extensions/TypeAliasRegistryExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Extensions/TypeAliasRegistryExtensions.cs
index 6a3764341..0d717c0f0 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Extensions/TypeAliasRegistryExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Extensions/TypeAliasRegistryExtensions.cs
@@ -1,7 +1,7 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Contracts;
-namespace Elsa.Scripting.JavaScript.Extensions;
+namespace Elsa.Expressions.JavaScript.Extensions;
///
/// Extends .
diff --git a/src/modules/Elsa.Scripting.JavaScript/Extensions/VariableNameExtensions.cs b/src/modules/Elsa.Expressions.JavaScript/Extensions/VariableNameExtensions.cs
similarity index 84%
rename from src/modules/Elsa.Scripting.JavaScript/Extensions/VariableNameExtensions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Extensions/VariableNameExtensions.cs
index 282c402db..669b21ef6 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Extensions/VariableNameExtensions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Extensions/VariableNameExtensions.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Helpers;
-namespace Elsa.Scripting.JavaScript.Extensions;
+namespace Elsa.Expressions.JavaScript.Extensions;
public static class VariableNameExtensions
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/Features/JavaScriptFeature.cs b/src/modules/Elsa.Expressions.JavaScript/Features/JavaScriptFeature.cs
similarity index 85%
rename from src/modules/Elsa.Scripting.JavaScript/Features/JavaScriptFeature.cs
rename to src/modules/Elsa.Expressions.JavaScript/Features/JavaScriptFeature.cs
index e7e059db0..043008a60 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Features/JavaScriptFeature.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Features/JavaScriptFeature.cs
@@ -5,19 +5,19 @@ using Elsa.Extensions;
using Elsa.Features.Abstractions;
using Elsa.Features.Attributes;
using Elsa.Features.Services;
-using Elsa.Scripting.JavaScript.Activities;
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.HostedServices;
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.Providers;
-using Elsa.Scripting.JavaScript.Services;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Services;
+using Elsa.Expressions.JavaScript.Activities;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.HostedServices;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Providers;
+using Elsa.Expressions.JavaScript.Services;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Services;
using Elsa.Workflows;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.JavaScript.Features;
+namespace Elsa.Expressions.JavaScript.Features;
///
/// Installs JavaScript integration.
diff --git a/src/modules/Elsa.Scripting.JavaScript/FodyWeavers.xml b/src/modules/Elsa.Expressions.JavaScript/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.JavaScript/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.JavaScript/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs
index 7cf6d2bf2..922974e49 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonFunctions.cs
@@ -5,14 +5,14 @@ using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using System.Text.Unicode;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Helpers;
-using Elsa.Scripting.JavaScript.Notifications;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Notifications;
+using Elsa.Expressions.JavaScript.Options;
using Elsa.Mediator.Contracts;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Handlers;
+namespace Elsa.Expressions.JavaScript.Handlers;
///
/// A handler that configures the Jint engine with common functions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs
rename to src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs
index e385644d2..9b7f53769 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithCommonTypes.cs
@@ -1,10 +1,10 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Notifications;
+using Elsa.Expressions.JavaScript.Notifications;
using Elsa.Mediator.Contracts;
using Elsa.Workflows.LogPersistence;
using JetBrains.Annotations;
-namespace Elsa.Scripting.JavaScript.Handlers;
+namespace Elsa.Expressions.JavaScript.Handlers;
///
/// A handler that configures the Jint engine with common types.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariables.cs b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariables.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariables.cs
rename to src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariables.cs
index d540e3bc3..13400e509 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariables.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariables.cs
@@ -2,17 +2,17 @@ using System.Dynamic;
using System.Text.RegularExpressions;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.Helpers;
-using Elsa.Scripting.JavaScript.Notifications;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Notifications;
+using Elsa.Expressions.JavaScript.Options;
using Elsa.Mediator.Contracts;
using Elsa.Workflows.Activities;
using JetBrains.Annotations;
using Jint.Native;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Handlers;
+namespace Elsa.Expressions.JavaScript.Handlers;
///
/// A handler that configures the Jint engine with workflow variables.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs
rename to src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs
index 5e0b9e282..6a443629d 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Handlers/ConfigureEngineWithVariablesAndInputOutputAccessors.cs
@@ -1,15 +1,15 @@
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.Notifications;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Notifications;
+using Elsa.Expressions.JavaScript.Options;
using Elsa.Mediator.Contracts;
using Humanizer;
using JetBrains.Annotations;
using Jint;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Handlers;
+namespace Elsa.Expressions.JavaScript.Handlers;
///
/// A handler that configures the Jint engine with workflow input and output accessors.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectArrayHelper.cs b/src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectArrayHelper.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectArrayHelper.cs
rename to src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectArrayHelper.cs
index db99e9904..4ad175950 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectArrayHelper.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectArrayHelper.cs
@@ -1,6 +1,6 @@
using System.Collections;
-namespace Elsa.Scripting.JavaScript.Helpers;
+namespace Elsa.Expressions.JavaScript.Helpers;
///
/// Contains helper methods for working with object arrays.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectConverterHelper.cs b/src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectConverterHelper.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectConverterHelper.cs
rename to src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectConverterHelper.cs
index 7db2e3686..28d9ecdcc 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Helpers/ObjectConverterHelper.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Helpers/ObjectConverterHelper.cs
@@ -1,14 +1,14 @@
using System.Collections;
using System.Dynamic;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Options;
using Jint;
using Jint.Native;
using Jint.Native.Object;
using Jint.Runtime.Descriptors;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Helpers;
+namespace Elsa.Expressions.JavaScript.Helpers;
internal static class ObjectConverterHelper
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/Helpers/VariableNameValidator.cs b/src/modules/Elsa.Expressions.JavaScript/Helpers/VariableNameValidator.cs
similarity index 80%
rename from src/modules/Elsa.Scripting.JavaScript/Helpers/VariableNameValidator.cs
rename to src/modules/Elsa.Expressions.JavaScript/Helpers/VariableNameValidator.cs
index eab8c21df..82a542e9d 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Helpers/VariableNameValidator.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Helpers/VariableNameValidator.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.Helpers;
+namespace Elsa.Expressions.JavaScript.Helpers;
public static class VariableNameValidator
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs b/src/modules/Elsa.Expressions.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs
rename to src/modules/Elsa.Expressions.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs
index afe7d143f..c3cda1caa 100644
--- a/src/modules/Elsa.Scripting.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/HostedServices/RegisterVariableTypesWithJavaScriptHostedService.cs
@@ -1,9 +1,9 @@
-using Elsa.Scripting.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Contracts;
using Elsa.Workflows.Management.Options;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.HostedServices;
+namespace Elsa.Expressions.JavaScript.HostedServices;
///
/// Registers variable types with the JavaScript type alias registry
diff --git a/src/modules/Elsa.Scripting.JavaScript/Models/Expression.cs b/src/modules/Elsa.Expressions.JavaScript/Models/Expression.cs
similarity index 88%
rename from src/modules/Elsa.Scripting.JavaScript/Models/Expression.cs
rename to src/modules/Elsa.Expressions.JavaScript/Models/Expression.cs
index e169edb8b..274ee82ad 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Models/Expression.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Models/Expression.cs
@@ -1,6 +1,6 @@
using Elsa.Expressions.Models;
-namespace Elsa.Scripting.JavaScript.Models;
+namespace Elsa.Expressions.JavaScript.Models;
///
/// Represents an expression.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Notifications/CreatingJavaScriptEngine.cs b/src/modules/Elsa.Expressions.JavaScript/Notifications/CreatingJavaScriptEngine.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.JavaScript/Notifications/CreatingJavaScriptEngine.cs
rename to src/modules/Elsa.Expressions.JavaScript/Notifications/CreatingJavaScriptEngine.cs
index 5a94058e6..12b2520e5 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Notifications/CreatingJavaScriptEngine.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Notifications/CreatingJavaScriptEngine.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
-namespace Elsa.Scripting.JavaScript.Notifications;
+namespace Elsa.Expressions.JavaScript.Notifications;
///
/// This notification is published when a JavaScript engine is being created.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatedJavaScript.cs b/src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatedJavaScript.cs
similarity index 86%
rename from src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatedJavaScript.cs
rename to src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatedJavaScript.cs
index ce9c4c451..01aeed7e9 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatedJavaScript.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatedJavaScript.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Jint;
-namespace Elsa.Scripting.JavaScript.Notifications;
+namespace Elsa.Expressions.JavaScript.Notifications;
///
/// This notification is published every time a JavaScript expression has been evaluated.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatingJavaScript.cs b/src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatingJavaScript.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatingJavaScript.cs
rename to src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatingJavaScript.cs
index 99f61296c..2f74a4d41 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Notifications/EvaluatingJavaScript.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Notifications/EvaluatingJavaScript.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Jint;
-namespace Elsa.Scripting.JavaScript.Notifications;
+namespace Elsa.Expressions.JavaScript.Notifications;
///
/// This notification is published every time a JavaScript expression is about to be evaluated.
diff --git a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/ByteArrayConverter.cs b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/ByteArrayConverter.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.JavaScript/ObjectConverters/ByteArrayConverter.cs
rename to src/modules/Elsa.Expressions.JavaScript/ObjectConverters/ByteArrayConverter.cs
index 1e2a213a5..47be37a3b 100644
--- a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/ByteArrayConverter.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/ByteArrayConverter.cs
@@ -3,7 +3,7 @@ using Jint;
using Jint.Native;
using Jint.Runtime.Interop;
-namespace Elsa.Scripting.JavaScript.ObjectConverters;
+namespace Elsa.Expressions.JavaScript.ObjectConverters;
///
/// Converts a byte array to a instance representing a Uint8Array.
diff --git a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/EnumToStringConverter.cs b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/EnumToStringConverter.cs
similarity index 88%
rename from src/modules/Elsa.Scripting.JavaScript/ObjectConverters/EnumToStringConverter.cs
rename to src/modules/Elsa.Expressions.JavaScript/ObjectConverters/EnumToStringConverter.cs
index 5060a296e..336979f77 100644
--- a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/EnumToStringConverter.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/EnumToStringConverter.cs
@@ -3,7 +3,7 @@ using Jint;
using Jint.Native;
using Jint.Runtime.Interop;
-namespace Elsa.Scripting.JavaScript.ObjectConverters;
+namespace Elsa.Expressions.JavaScript.ObjectConverters;
internal class EnumToStringConverter : IObjectConverter
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/JsonElementConverter.cs b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/JsonElementConverter.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.JavaScript/ObjectConverters/JsonElementConverter.cs
rename to src/modules/Elsa.Expressions.JavaScript/ObjectConverters/JsonElementConverter.cs
index d4a7941c7..121fb2648 100644
--- a/src/modules/Elsa.Scripting.JavaScript/ObjectConverters/JsonElementConverter.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/ObjectConverters/JsonElementConverter.cs
@@ -5,7 +5,7 @@ using Jint;
using Jint.Native;
using Jint.Runtime.Interop;
-namespace Elsa.Scripting.JavaScript.ObjectConverters;
+namespace Elsa.Expressions.JavaScript.ObjectConverters;
internal class JsonElementConverter : IObjectConverter
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/Options/JintOptions.cs b/src/modules/Elsa.Expressions.JavaScript/Options/JintOptions.cs
similarity index 99%
rename from src/modules/Elsa.Scripting.JavaScript/Options/JintOptions.cs
rename to src/modules/Elsa.Expressions.JavaScript/Options/JintOptions.cs
index 1b8ae6a93..51f5306b5 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Options/JintOptions.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Options/JintOptions.cs
@@ -2,7 +2,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
using Jint;
-namespace Elsa.Scripting.JavaScript.Options;
+namespace Elsa.Expressions.JavaScript.Options;
///
/// Options for the Jint JavaScript engine.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs
similarity index 84%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs
index 04a0eeedd..cd3f66fca 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/ActivityOutputFunctionsDefinitionProvider.cs
@@ -1,14 +1,14 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using Elsa.Workflows;
using Humanizer;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
///
/// Produces s for common functions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs
index 049c091d1..b612906e5 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/CommonFunctionsDefinitionProvider.cs
@@ -1,14 +1,14 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using Humanizer;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
///
/// Produces s for common functions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/CommonTypesDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/CommonTypesDefinitionProvider.cs
similarity index 69%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/CommonTypesDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/CommonTypesDefinitionProvider.cs
index cf68612fa..fe25e2b26 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/CommonTypesDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/CommonTypesDefinitionProvider.cs
@@ -1,9 +1,9 @@
using System.Text.Json.Nodes;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
///
/// Produces s for common types.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/InputFunctionsDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/InputFunctionsDefinitionProvider.cs
similarity index 82%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/InputFunctionsDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/InputFunctionsDefinitionProvider.cs
index 0940b7320..56d3129f1 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/InputFunctionsDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/InputFunctionsDefinitionProvider.cs
@@ -1,14 +1,14 @@
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.Helpers;
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using Elsa.Workflows.Activities;
using Humanizer;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
///
/// Produces s for common functions.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
similarity index 87%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
index 86dec3d83..b3f8a4c29 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
@@ -1,11 +1,11 @@
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Expressions;
+using Elsa.Expressions.JavaScript.Expressions;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
[UsedImplicitly]
internal class JavaScriptExpressionDescriptorProvider : IExpressionDescriptorProvider
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/VariableTypeDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/VariableTypeDefinitionProvider.cs
similarity index 83%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/VariableTypeDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/VariableTypeDefinitionProvider.cs
index c1dc0955b..60bc39e8c 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/VariableTypeDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/VariableTypeDefinitionProvider.cs
@@ -1,10 +1,10 @@
using System.Dynamic;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
///
/// Produces s for variable types.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs
similarity index 80%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs
index 965248172..a276a4c64 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesTypeDefinitionProvider.cs
@@ -1,12 +1,12 @@
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Extensions;
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
[UsedImplicitly]
internal class WorkflowVariablesTypeDefinitionProvider(IOptions options) : TypeDefinitionProvider
diff --git a/src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesVariableProvider.cs b/src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesVariableProvider.cs
similarity index 69%
rename from src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesVariableProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesVariableProvider.cs
index 8af56cf33..e3a7acc57 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Providers/WorkflowVariablesVariableProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Providers/WorkflowVariablesVariableProvider.cs
@@ -1,10 +1,10 @@
-using Elsa.Scripting.JavaScript.Options;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Options;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.JavaScript.Providers;
+namespace Elsa.Expressions.JavaScript.Providers;
[UsedImplicitly]
internal class WorkflowVariablesVariableProvider(IOptions options) : VariableDefinitionProvider
diff --git a/src/modules/Elsa.Scripting.JavaScript/Services/JintJavaScriptEvaluator.cs b/src/modules/Elsa.Expressions.JavaScript/Services/JintJavaScriptEvaluator.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/Services/JintJavaScriptEvaluator.cs
rename to src/modules/Elsa.Expressions.JavaScript/Services/JintJavaScriptEvaluator.cs
index aa8d74ee9..10ac0d83c 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Services/JintJavaScriptEvaluator.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Services/JintJavaScriptEvaluator.cs
@@ -4,11 +4,11 @@ using System.Text;
using Acornima.Ast;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.Helpers;
-using Elsa.Scripting.JavaScript.Notifications;
-using Elsa.Scripting.JavaScript.ObjectConverters;
-using Elsa.Scripting.JavaScript.Options;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Helpers;
+using Elsa.Expressions.JavaScript.Notifications;
+using Elsa.Expressions.JavaScript.ObjectConverters;
+using Elsa.Expressions.JavaScript.Options;
using Elsa.Mediator.Contracts;
using Jint;
using Jint.Runtime.Interop;
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
// ReSharper disable ConvertClosureToMethodGroup
-namespace Elsa.Scripting.JavaScript.Services;
+namespace Elsa.Expressions.JavaScript.Services;
///
/// Provides a JavaScript evaluator using Jint.
diff --git a/src/modules/Elsa.Scripting.JavaScript/Services/TypeAliasRegistry.cs b/src/modules/Elsa.Expressions.JavaScript/Services/TypeAliasRegistry.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.JavaScript/Services/TypeAliasRegistry.cs
rename to src/modules/Elsa.Expressions.JavaScript/Services/TypeAliasRegistry.cs
index 0e390fb8d..665579a56 100644
--- a/src/modules/Elsa.Scripting.JavaScript/Services/TypeAliasRegistry.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/Services/TypeAliasRegistry.cs
@@ -1,9 +1,9 @@
using System.Dynamic;
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.Extensions;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.Extensions;
using Elsa.Workflows.LogPersistence;
-namespace Elsa.Scripting.JavaScript.Services;
+namespace Elsa.Expressions.JavaScript.Services;
///
public class TypeAliasRegistry : ITypeAliasRegistry
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs
similarity index 83%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs
index 84f3b2a7a..959a8759d 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/FunctionDefinitionProvider.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
///
/// A base class for function definition providers.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs
similarity index 82%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs
index 7ca4f6ab2..438b43e12 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/TypeDefinitionProvider.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
///
/// A base class for type definition providers.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs
similarity index 77%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs
index 941ee5861..9c003cd61 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Abstractions/VariableDefinitionProvider.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Abstractions;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Abstractions;
public abstract class VariableDefinitionProvider : IVariableDefinitionProvider
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs
index 57304cf5c..c9952c842 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/FunctionDefinitionBuilder.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
///
/// A builder API for building s.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs
similarity index 86%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs
index 11ea5be08..bbd660927 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/TypeDefinitionBuilder.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
///
/// A builder API for building s.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs
similarity index 79%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs
index b78bef850..582068638 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Builders/VariableDefinitionBuilder.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Builders;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Builders;
public class VariableDefinitionBuilder
{
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs
similarity index 75%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs
index bf4de61f2..00d289ff4 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IFunctionDefinitionProvider.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Provides s to the type definition document being constructed.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs
similarity index 71%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs
index 0bf6822ba..ea64f2f10 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionDocumentRenderer.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Renders a to a string.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs
similarity index 74%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs
index cd505fa3e..99b3061aa 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionProvider.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Provides s to the type definition document being constructed.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs
similarity index 71%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs
index bb9c46dec..13189b063 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDefinitionService.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Generates type definitions for the specified context.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs
similarity index 71%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs
index 9a7e86b86..47fe1a858 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/ITypeDescriber.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Returns a from a given .
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs
similarity index 69%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs
index 7d71d5a6c..e6bb40402 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Contracts/IVariableDefinitionProvider.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
///
/// Provides s to the type definition document being constructed.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs
index 4307b76a8..7841c4897 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/FunctionDefinition.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// A method definition.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs
index deafcd069..5ede2daea 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/ParameterDefinition.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// A method parameter definition.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs
similarity index 88%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs
index 96d4af0f6..6faf93f65 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/PropertyDefinition.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// A property definition.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinition.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinition.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinition.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinition.cs
index 449cd688a..1ba7ffb96 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinition.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinition.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs
similarity index 80%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs
index 362cfad21..fddf7ec49 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionContext.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// Provides context to intellisense providers.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs
index 00e5dccf4..3141ac877 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/TypeDefinitionsDocument.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// Represents a type definition document model.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/VariableDefinition.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/VariableDefinition.cs
similarity index 85%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/VariableDefinition.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/VariableDefinition.cs
index 79cc455c8..acb69f8cb 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Models/VariableDefinition.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Models/VariableDefinition.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Models;
///
/// Represents a variable definition.
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs
index 982ad58a2..fcc66000a 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionDocumentRenderer.cs
@@ -1,8 +1,8 @@
using System.Text;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Services;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Services;
///
public class TypeDefinitionDocumentRenderer : ITypeDefinitionDocumentRenderer
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs
index 72f5e2c61..7f302d3f3 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDefinitionService.cs
@@ -1,7 +1,7 @@
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Services;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Services;
///
public class TypeDefinitionService(
diff --git a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDescriber.cs b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDescriber.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDescriber.cs
rename to src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDescriber.cs
index f177c623d..fc7079e98 100644
--- a/src/modules/Elsa.Scripting.JavaScript/TypeDefinitions/Services/TypeDescriber.cs
+++ b/src/modules/Elsa.Expressions.JavaScript/TypeDefinitions/Services/TypeDescriber.cs
@@ -1,11 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using Elsa.Extensions;
-using Elsa.Scripting.JavaScript.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts;
-using Elsa.Scripting.JavaScript.TypeDefinitions.Models;
+using Elsa.Expressions.JavaScript.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts;
+using Elsa.Expressions.JavaScript.TypeDefinitions.Models;
-namespace Elsa.Scripting.JavaScript.TypeDefinitions.Services;
+namespace Elsa.Expressions.JavaScript.TypeDefinitions.Services;
///
public class TypeDescriber : ITypeDescriber
diff --git a/src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidFilter.cs b/src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidFilter.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidFilter.cs
rename to src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidFilter.cs
index f1c87c260..2cfa83a75 100644
--- a/src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidFilter.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidFilter.cs
@@ -1,7 +1,7 @@
using Fluid;
using Fluid.Values;
-namespace Elsa.Scripting.Liquid.Contracts;
+namespace Elsa.Expressions.Liquid.Contracts;
///
/// Represents a Liquid filter.
diff --git a/src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidTemplateManager.cs b/src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidTemplateManager.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidTemplateManager.cs
rename to src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidTemplateManager.cs
index 1eee8bc7c..e8a340d40 100644
--- a/src/modules/Elsa.Scripting.Liquid/Contracts/ILiquidTemplateManager.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Contracts/ILiquidTemplateManager.cs
@@ -1,6 +1,6 @@
using Elsa.Expressions.Models;
-namespace Elsa.Scripting.Liquid.Contracts;
+namespace Elsa.Expressions.Liquid.Contracts;
///
/// Provides services to render Liquid templates.
diff --git a/src/modules/Elsa.Scripting.Liquid/Elsa.Scripting.Liquid.csproj b/src/modules/Elsa.Expressions.Liquid/Elsa.Expressions.Liquid.csproj
similarity index 100%
rename from src/modules/Elsa.Scripting.Liquid/Elsa.Scripting.Liquid.csproj
rename to src/modules/Elsa.Expressions.Liquid/Elsa.Expressions.Liquid.csproj
diff --git a/src/modules/Elsa.Scripting.Liquid/Expressions/LiquidExpressionHandler.cs b/src/modules/Elsa.Expressions.Liquid/Expressions/LiquidExpressionHandler.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.Liquid/Expressions/LiquidExpressionHandler.cs
rename to src/modules/Elsa.Expressions.Liquid/Expressions/LiquidExpressionHandler.cs
index f222b3f4e..37ec964b1 100644
--- a/src/modules/Elsa.Scripting.Liquid/Expressions/LiquidExpressionHandler.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Expressions/LiquidExpressionHandler.cs
@@ -1,9 +1,9 @@
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
-using Elsa.Scripting.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Contracts;
-namespace Elsa.Scripting.Liquid.Expressions;
+namespace Elsa.Expressions.Liquid.Expressions;
///
/// Evaluates a Liquid expression.
diff --git a/src/modules/Elsa.Scripting.Liquid/Extensions/DependencyInjectionExtensions.cs b/src/modules/Elsa.Expressions.Liquid/Extensions/DependencyInjectionExtensions.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.Liquid/Extensions/DependencyInjectionExtensions.cs
rename to src/modules/Elsa.Expressions.Liquid/Extensions/DependencyInjectionExtensions.cs
index ec329ba6b..28bc9f990 100644
--- a/src/modules/Elsa.Scripting.Liquid/Extensions/DependencyInjectionExtensions.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Extensions/DependencyInjectionExtensions.cs
@@ -1,6 +1,6 @@
-using Elsa.Scripting.Liquid.Contracts;
-using Elsa.Scripting.Liquid.Options;
-using Elsa.Scripting.Liquid.Services;
+using Elsa.Expressions.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Options;
+using Elsa.Expressions.Liquid.Services;
// ReSharper disable once CheckNamespace
namespace Microsoft.Extensions.DependencyInjection;
diff --git a/src/modules/Elsa.Scripting.Liquid/Extensions/ModuleExtensions.cs b/src/modules/Elsa.Expressions.Liquid/Extensions/ModuleExtensions.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.Liquid/Extensions/ModuleExtensions.cs
rename to src/modules/Elsa.Expressions.Liquid/Extensions/ModuleExtensions.cs
index 7b7b8bde6..6ed81d6f6 100644
--- a/src/modules/Elsa.Scripting.Liquid/Extensions/ModuleExtensions.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Extensions/ModuleExtensions.cs
@@ -1,5 +1,5 @@
using Elsa.Features.Services;
-using Elsa.Scripting.Liquid.Features;
+using Elsa.Expressions.Liquid.Features;
// ReSharper disable once CheckNamespace
namespace Elsa.Extensions;
diff --git a/src/modules/Elsa.Scripting.Liquid/Extensions/TemplateContextExtensions.cs b/src/modules/Elsa.Expressions.Liquid/Extensions/TemplateContextExtensions.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.Liquid/Extensions/TemplateContextExtensions.cs
rename to src/modules/Elsa.Expressions.Liquid/Extensions/TemplateContextExtensions.cs
index 4e0ce2d3e..49a2b1159 100644
--- a/src/modules/Elsa.Scripting.Liquid/Extensions/TemplateContextExtensions.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Extensions/TemplateContextExtensions.cs
@@ -1,5 +1,5 @@
-using Elsa.Scripting.Liquid.Contracts;
-using Elsa.Scripting.Liquid.Options;
+using Elsa.Expressions.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Options;
using Fluid;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/modules/Elsa.Scripting.Liquid/Features/LiquidFeature.cs b/src/modules/Elsa.Expressions.Liquid/Features/LiquidFeature.cs
similarity index 83%
rename from src/modules/Elsa.Scripting.Liquid/Features/LiquidFeature.cs
rename to src/modules/Elsa.Expressions.Liquid/Features/LiquidFeature.cs
index f0ffc7ab9..8e046d47b 100644
--- a/src/modules/Elsa.Scripting.Liquid/Features/LiquidFeature.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Features/LiquidFeature.cs
@@ -5,16 +5,16 @@ using Elsa.Extensions;
using Elsa.Features.Abstractions;
using Elsa.Features.Attributes;
using Elsa.Features.Services;
-using Elsa.Scripting.Liquid.Contracts;
-using Elsa.Scripting.Liquid.Filters;
-using Elsa.Scripting.Liquid.Handlers;
-using Elsa.Scripting.Liquid.Options;
-using Elsa.Scripting.Liquid.Providers;
-using Elsa.Scripting.Liquid.Services;
+using Elsa.Expressions.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Filters;
+using Elsa.Expressions.Liquid.Handlers;
+using Elsa.Expressions.Liquid.Options;
+using Elsa.Expressions.Liquid.Providers;
+using Elsa.Expressions.Liquid.Services;
using Fluid.Filters;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.Liquid.Features;
+namespace Elsa.Expressions.Liquid.Features;
///
/// Configures liquid functionality.
diff --git a/src/modules/Elsa.Scripting.Liquid/Filters/Base64Filter.cs b/src/modules/Elsa.Expressions.Liquid/Filters/Base64Filter.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.Liquid/Filters/Base64Filter.cs
rename to src/modules/Elsa.Expressions.Liquid/Filters/Base64Filter.cs
index ff9164bf5..1800f4d4e 100644
--- a/src/modules/Elsa.Scripting.Liquid/Filters/Base64Filter.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Filters/Base64Filter.cs
@@ -1,11 +1,11 @@
using System.Globalization;
using System.Text;
using System.Text.Json;
-using Elsa.Scripting.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Contracts;
using Fluid;
using Fluid.Values;
-namespace Elsa.Scripting.Liquid.Filters;
+namespace Elsa.Expressions.Liquid.Filters;
///
/// A liquid filter that converts a value into a base 64 string representation.
diff --git a/src/modules/Elsa.Scripting.Liquid/Filters/DictionaryKeysFilter.cs b/src/modules/Elsa.Expressions.Liquid/Filters/DictionaryKeysFilter.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.Liquid/Filters/DictionaryKeysFilter.cs
rename to src/modules/Elsa.Expressions.Liquid/Filters/DictionaryKeysFilter.cs
index 4629c3576..f2c59ad95 100644
--- a/src/modules/Elsa.Scripting.Liquid/Filters/DictionaryKeysFilter.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Filters/DictionaryKeysFilter.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Contracts;
using Fluid;
using Fluid.Values;
-namespace Elsa.Scripting.Liquid.Filters;
+namespace Elsa.Expressions.Liquid.Filters;
///
/// A liquid filter that extracts the key values from a value.
diff --git a/src/modules/Elsa.Scripting.Liquid/FodyWeavers.xml b/src/modules/Elsa.Expressions.Liquid/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.Liquid/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.Liquid/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.Liquid/Handlers/ConfigureLiquidEngine.cs b/src/modules/Elsa.Expressions.Liquid/Handlers/ConfigureLiquidEngine.cs
similarity index 96%
rename from src/modules/Elsa.Scripting.Liquid/Handlers/ConfigureLiquidEngine.cs
rename to src/modules/Elsa.Expressions.Liquid/Handlers/ConfigureLiquidEngine.cs
index 80728c6d3..5fb40d3f4 100644
--- a/src/modules/Elsa.Scripting.Liquid/Handlers/ConfigureLiquidEngine.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Handlers/ConfigureLiquidEngine.cs
@@ -1,9 +1,9 @@
using System.Dynamic;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.Liquid.Helpers;
-using Elsa.Scripting.Liquid.Notifications;
-using Elsa.Scripting.Liquid.Options;
+using Elsa.Expressions.Liquid.Helpers;
+using Elsa.Expressions.Liquid.Notifications;
+using Elsa.Expressions.Liquid.Options;
using Elsa.Mediator.Contracts;
using Elsa.Workflows.Management.Options;
using Elsa.Workflows.Memory;
@@ -12,7 +12,7 @@ using Fluid.Values;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.Liquid.Handlers;
+namespace Elsa.Expressions.Liquid.Handlers;
///
/// Configures the liquid templating engine before evaluating a liquid expression.
diff --git a/src/modules/Elsa.Scripting.Liquid/Helpers/ConfigurationSectionWrapper.cs b/src/modules/Elsa.Expressions.Liquid/Helpers/ConfigurationSectionWrapper.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.Liquid/Helpers/ConfigurationSectionWrapper.cs
rename to src/modules/Elsa.Expressions.Liquid/Helpers/ConfigurationSectionWrapper.cs
index f37949fad..894e3d85e 100644
--- a/src/modules/Elsa.Scripting.Liquid/Helpers/ConfigurationSectionWrapper.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Helpers/ConfigurationSectionWrapper.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Configuration;
-namespace Elsa.Scripting.Liquid.Helpers;
+namespace Elsa.Expressions.Liquid.Helpers;
public class ConfigurationSectionWrapper
{
diff --git a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidActivityModel.cs b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidActivityModel.cs
similarity index 85%
rename from src/modules/Elsa.Scripting.Liquid/Helpers/LiquidActivityModel.cs
rename to src/modules/Elsa.Expressions.Liquid/Helpers/LiquidActivityModel.cs
index 6dd90573d..0bed0125f 100644
--- a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidActivityModel.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidActivityModel.cs
@@ -1,6 +1,6 @@
using Elsa.Workflows;
-namespace Elsa.Scripting.Liquid.Helpers;
+namespace Elsa.Expressions.Liquid.Helpers;
///
/// A model that is passed to Liquid templates when rendering an activity.
diff --git a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidObjectAccessor.cs b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidObjectAccessor.cs
similarity index 89%
rename from src/modules/Elsa.Scripting.Liquid/Helpers/LiquidObjectAccessor.cs
rename to src/modules/Elsa.Expressions.Liquid/Helpers/LiquidObjectAccessor.cs
index 468070b27..6e72beb93 100644
--- a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidObjectAccessor.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidObjectAccessor.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Scripting.Liquid.Helpers;
+namespace Elsa.Expressions.Liquid.Helpers;
///
/// Can be used to provide a factory to return an object based on a property name that is unknown at registration time.
diff --git a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidPropertyAccessor.cs b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidPropertyAccessor.cs
similarity index 91%
rename from src/modules/Elsa.Scripting.Liquid/Helpers/LiquidPropertyAccessor.cs
rename to src/modules/Elsa.Expressions.Liquid/Helpers/LiquidPropertyAccessor.cs
index 426222aaf..199afc18b 100644
--- a/src/modules/Elsa.Scripting.Liquid/Helpers/LiquidPropertyAccessor.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Helpers/LiquidPropertyAccessor.cs
@@ -1,6 +1,6 @@
using Fluid.Values;
-namespace Elsa.Scripting.Liquid.Helpers;
+namespace Elsa.Expressions.Liquid.Helpers;
///
/// Can be used to provide a factory to return a value based on a property name
diff --git a/src/modules/Elsa.Scripting.Liquid/Notifications/RenderingLiquidTemplate.cs b/src/modules/Elsa.Expressions.Liquid/Notifications/RenderingLiquidTemplate.cs
similarity index 80%
rename from src/modules/Elsa.Scripting.Liquid/Notifications/RenderingLiquidTemplate.cs
rename to src/modules/Elsa.Expressions.Liquid/Notifications/RenderingLiquidTemplate.cs
index f9aae707e..46d8c5654 100644
--- a/src/modules/Elsa.Scripting.Liquid/Notifications/RenderingLiquidTemplate.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Notifications/RenderingLiquidTemplate.cs
@@ -2,6 +2,6 @@ using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Fluid;
-namespace Elsa.Scripting.Liquid.Notifications;
+namespace Elsa.Expressions.Liquid.Notifications;
public record RenderingLiquidTemplate(TemplateContext TemplateContext, ExpressionExecutionContext Context) : INotification;
\ No newline at end of file
diff --git a/src/modules/Elsa.Scripting.Liquid/Options/FluidOptions.cs b/src/modules/Elsa.Expressions.Liquid/Options/FluidOptions.cs
similarity index 92%
rename from src/modules/Elsa.Scripting.Liquid/Options/FluidOptions.cs
rename to src/modules/Elsa.Expressions.Liquid/Options/FluidOptions.cs
index aefe8f896..ac9ab7a79 100644
--- a/src/modules/Elsa.Scripting.Liquid/Options/FluidOptions.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Options/FluidOptions.cs
@@ -1,8 +1,8 @@
using System.Text.Encodings.Web;
-using Elsa.Scripting.Liquid.Services;
+using Elsa.Expressions.Liquid.Services;
using Fluid;
-namespace Elsa.Scripting.Liquid.Options;
+namespace Elsa.Expressions.Liquid.Options;
///
/// Options for configuring the Liquid templating engine.
diff --git a/src/modules/Elsa.Scripting.Liquid/Providers/LiquidExpressionSyntaxProvider.cs b/src/modules/Elsa.Expressions.Liquid/Providers/LiquidExpressionSyntaxProvider.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.Liquid/Providers/LiquidExpressionSyntaxProvider.cs
rename to src/modules/Elsa.Expressions.Liquid/Providers/LiquidExpressionSyntaxProvider.cs
index 7147f13ac..c18cd05f5 100644
--- a/src/modules/Elsa.Scripting.Liquid/Providers/LiquidExpressionSyntaxProvider.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Providers/LiquidExpressionSyntaxProvider.cs
@@ -1,10 +1,10 @@
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.Liquid.Expressions;
+using Elsa.Expressions.Liquid.Expressions;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.Liquid.Providers;
+namespace Elsa.Expressions.Liquid.Providers;
///
/// Provides Liquid expression descriptors.
diff --git a/src/modules/Elsa.Scripting.Liquid/Services/LiquidParser.cs b/src/modules/Elsa.Expressions.Liquid/Services/LiquidParser.cs
similarity index 81%
rename from src/modules/Elsa.Scripting.Liquid/Services/LiquidParser.cs
rename to src/modules/Elsa.Expressions.Liquid/Services/LiquidParser.cs
index 813a08b37..e5530a1a1 100644
--- a/src/modules/Elsa.Scripting.Liquid/Services/LiquidParser.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Services/LiquidParser.cs
@@ -1,8 +1,8 @@
-using Elsa.Scripting.Liquid.Options;
+using Elsa.Expressions.Liquid.Options;
using Fluid;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.Liquid.Services;
+namespace Elsa.Expressions.Liquid.Services;
///
/// A parser for the Liquid templating engine.
diff --git a/src/modules/Elsa.Scripting.Liquid/Services/LiquidTemplateManager.cs b/src/modules/Elsa.Expressions.Liquid/Services/LiquidTemplateManager.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.Liquid/Services/LiquidTemplateManager.cs
rename to src/modules/Elsa.Expressions.Liquid/Services/LiquidTemplateManager.cs
index d5ba5c965..c470d21c7 100644
--- a/src/modules/Elsa.Scripting.Liquid/Services/LiquidTemplateManager.cs
+++ b/src/modules/Elsa.Expressions.Liquid/Services/LiquidTemplateManager.cs
@@ -1,14 +1,14 @@
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.Liquid.Contracts;
-using Elsa.Scripting.Liquid.Notifications;
-using Elsa.Scripting.Liquid.Options;
+using Elsa.Expressions.Liquid.Contracts;
+using Elsa.Expressions.Liquid.Notifications;
+using Elsa.Expressions.Liquid.Options;
using Elsa.Mediator.Contracts;
using Fluid;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.Liquid.Services;
+namespace Elsa.Expressions.Liquid.Services;
///
public class LiquidTemplateManager : ILiquidTemplateManager
diff --git a/src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPython.cs b/src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPython.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPython.cs
rename to src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPython.cs
index 5a0731017..9b92ffb4c 100644
--- a/src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPython.cs
+++ b/src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPython.cs
@@ -1,14 +1,14 @@
using System.Runtime.CompilerServices;
using Elsa.Extensions;
-using Elsa.Scripting.Python.Contracts;
-using Elsa.Scripting.Python.Models;
+using Elsa.Expressions.Python.Contracts;
+using Elsa.Expressions.Python.Models;
using Elsa.Workflows;
using Elsa.Workflows.Attributes;
using Elsa.Workflows.UIHints;
using Elsa.Workflows.Models;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.Python.Activities;
+namespace Elsa.Expressions.Python.Activities;
///
/// Executes Python code.
diff --git a/src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPythonOptionsProvider.cs b/src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPythonOptionsProvider.cs
similarity index 86%
rename from src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPythonOptionsProvider.cs
rename to src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPythonOptionsProvider.cs
index 65f185e00..1dbc3dd1e 100644
--- a/src/modules/Elsa.Scripting.Python/Activities/RunPython/RunPythonOptionsProvider.cs
+++ b/src/modules/Elsa.Expressions.Python/Activities/RunPython/RunPythonOptionsProvider.cs
@@ -2,7 +2,7 @@ using System.Reflection;
using Elsa.Workflows.UIHints.CodeEditor;
// ReSharper disable once CheckNamespace
-namespace Elsa.Scripting.Python.Activities;
+namespace Elsa.Expressions.Python.Activities;
internal class RunPythonOptionsProvider : CodeEditorOptionsProviderBase
{
diff --git a/src/modules/Elsa.Scripting.Python/Contracts/IPythonEvaluator.cs b/src/modules/Elsa.Expressions.Python/Contracts/IPythonEvaluator.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.Python/Contracts/IPythonEvaluator.cs
rename to src/modules/Elsa.Expressions.Python/Contracts/IPythonEvaluator.cs
index b10e95149..ca2215a74 100644
--- a/src/modules/Elsa.Scripting.Python/Contracts/IPythonEvaluator.cs
+++ b/src/modules/Elsa.Expressions.Python/Contracts/IPythonEvaluator.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
using JetBrains.Annotations;
-namespace Elsa.Scripting.Python.Contracts;
+namespace Elsa.Expressions.Python.Contracts;
///
/// Evaluates C# expressions.
diff --git a/src/modules/Elsa.Scripting.Python/Elsa.Scripting.Python.csproj b/src/modules/Elsa.Expressions.Python/Elsa.Expressions.Python.csproj
similarity index 100%
rename from src/modules/Elsa.Scripting.Python/Elsa.Scripting.Python.csproj
rename to src/modules/Elsa.Expressions.Python/Elsa.Expressions.Python.csproj
diff --git a/src/modules/Elsa.Scripting.Python/Expressions/PythonExpressionHandler.cs b/src/modules/Elsa.Expressions.Python/Expressions/PythonExpressionHandler.cs
similarity index 90%
rename from src/modules/Elsa.Scripting.Python/Expressions/PythonExpressionHandler.cs
rename to src/modules/Elsa.Expressions.Python/Expressions/PythonExpressionHandler.cs
index 0c161b911..9878dc2bd 100644
--- a/src/modules/Elsa.Scripting.Python/Expressions/PythonExpressionHandler.cs
+++ b/src/modules/Elsa.Expressions.Python/Expressions/PythonExpressionHandler.cs
@@ -1,9 +1,9 @@
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
-using Elsa.Scripting.Python.Contracts;
+using Elsa.Expressions.Python.Contracts;
-namespace Elsa.Scripting.Python.Expressions;
+namespace Elsa.Expressions.Python.Expressions;
///
/// Evaluates C# expressions.
diff --git a/src/modules/Elsa.Scripting.Python/Extensions/ModuleExtensions.cs b/src/modules/Elsa.Expressions.Python/Extensions/ModuleExtensions.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.Python/Extensions/ModuleExtensions.cs
rename to src/modules/Elsa.Expressions.Python/Extensions/ModuleExtensions.cs
index 18e1136f0..73fe38bc8 100644
--- a/src/modules/Elsa.Scripting.Python/Extensions/ModuleExtensions.cs
+++ b/src/modules/Elsa.Expressions.Python/Extensions/ModuleExtensions.cs
@@ -1,5 +1,5 @@
using Elsa.Features.Services;
-using Elsa.Scripting.Python.Features;
+using Elsa.Expressions.Python.Features;
// ReSharper disable once CheckNamespace
namespace Elsa.Extensions;
diff --git a/src/modules/Elsa.Scripting.Python/Features/PythonFeature.cs b/src/modules/Elsa.Expressions.Python/Features/PythonFeature.cs
similarity index 83%
rename from src/modules/Elsa.Scripting.Python/Features/PythonFeature.cs
rename to src/modules/Elsa.Expressions.Python/Features/PythonFeature.cs
index 1e47a224d..bf60b606a 100644
--- a/src/modules/Elsa.Scripting.Python/Features/PythonFeature.cs
+++ b/src/modules/Elsa.Expressions.Python/Features/PythonFeature.cs
@@ -4,16 +4,16 @@ using Elsa.Extensions;
using Elsa.Features.Abstractions;
using Elsa.Features.Attributes;
using Elsa.Features.Services;
-using Elsa.Scripting.Python.Activities;
-using Elsa.Scripting.Python.Contracts;
-using Elsa.Scripting.Python.HostedServices;
-using Elsa.Scripting.Python.Options;
-using Elsa.Scripting.Python.Providers;
-using Elsa.Scripting.Python.Services;
+using Elsa.Expressions.Python.Activities;
+using Elsa.Expressions.Python.Contracts;
+using Elsa.Expressions.Python.HostedServices;
+using Elsa.Expressions.Python.Options;
+using Elsa.Expressions.Python.Providers;
+using Elsa.Expressions.Python.Services;
using Elsa.Workflows;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.Python.Features;
+namespace Elsa.Expressions.Python.Features;
///
/// Installs Python integration.
diff --git a/src/modules/Elsa.Scripting.Python/FodyWeavers.xml b/src/modules/Elsa.Expressions.Python/FodyWeavers.xml
similarity index 100%
rename from src/modules/Elsa.Scripting.Python/FodyWeavers.xml
rename to src/modules/Elsa.Expressions.Python/FodyWeavers.xml
diff --git a/src/modules/Elsa.Scripting.Python/Handlers/AddInputAccessors.cs b/src/modules/Elsa.Expressions.Python/Handlers/AddInputAccessors.cs
similarity index 80%
rename from src/modules/Elsa.Scripting.Python/Handlers/AddInputAccessors.cs
rename to src/modules/Elsa.Expressions.Python/Handlers/AddInputAccessors.cs
index a51997242..14a1b4515 100644
--- a/src/modules/Elsa.Scripting.Python/Handlers/AddInputAccessors.cs
+++ b/src/modules/Elsa.Expressions.Python/Handlers/AddInputAccessors.cs
@@ -1,9 +1,9 @@
using Elsa.Mediator.Contracts;
-using Elsa.Scripting.Python.Models;
-using Elsa.Scripting.Python.Notifications;
+using Elsa.Expressions.Python.Models;
+using Elsa.Expressions.Python.Notifications;
using JetBrains.Annotations;
-namespace Elsa.Scripting.Python.Handlers;
+namespace Elsa.Expressions.Python.Handlers;
///
/// Adds input accessors to the Python engine.
diff --git a/src/modules/Elsa.Scripting.Python/Handlers/ConfigurePythonFromOptions.cs b/src/modules/Elsa.Expressions.Python/Handlers/ConfigurePythonFromOptions.cs
similarity index 87%
rename from src/modules/Elsa.Scripting.Python/Handlers/ConfigurePythonFromOptions.cs
rename to src/modules/Elsa.Expressions.Python/Handlers/ConfigurePythonFromOptions.cs
index b3528ac86..d0a4f25d9 100644
--- a/src/modules/Elsa.Scripting.Python/Handlers/ConfigurePythonFromOptions.cs
+++ b/src/modules/Elsa.Expressions.Python/Handlers/ConfigurePythonFromOptions.cs
@@ -1,10 +1,10 @@
using Elsa.Mediator.Contracts;
-using Elsa.Scripting.Python.Notifications;
-using Elsa.Scripting.Python.Options;
+using Elsa.Expressions.Python.Notifications;
+using Elsa.Expressions.Python.Options;
using JetBrains.Annotations;
using Microsoft.Extensions.Options;
-namespace Elsa.Scripting.Python.Handlers;
+namespace Elsa.Expressions.Python.Handlers;
///
/// This handler configures the Python engine based on the .
diff --git a/src/modules/Elsa.Scripting.Python/Handlers/GenerateWorkflowVariableAccessors.cs b/src/modules/Elsa.Expressions.Python/Handlers/GenerateWorkflowVariableAccessors.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Python/Handlers/GenerateWorkflowVariableAccessors.cs
rename to src/modules/Elsa.Expressions.Python/Handlers/GenerateWorkflowVariableAccessors.cs
index 213d9d9c7..bdc8f8165 100644
--- a/src/modules/Elsa.Scripting.Python/Handlers/GenerateWorkflowVariableAccessors.cs
+++ b/src/modules/Elsa.Expressions.Python/Handlers/GenerateWorkflowVariableAccessors.cs
@@ -2,10 +2,10 @@ using System.Text;
using Elsa.Expressions.Models;
using Elsa.Extensions;
using Elsa.Mediator.Contracts;
-using Elsa.Scripting.Python.Notifications;
+using Elsa.Expressions.Python.Notifications;
using JetBrains.Annotations;
-namespace Elsa.Scripting.Python.Handlers;
+namespace Elsa.Expressions.Python.Handlers;
///
/// Configures the C# evaluator with methods to access workflow variables.
diff --git a/src/modules/Elsa.Scripting.Python/HostedServices/PythonGlobalInterpreterManager.cs b/src/modules/Elsa.Expressions.Python/HostedServices/PythonGlobalInterpreterManager.cs
similarity index 94%
rename from src/modules/Elsa.Scripting.Python/HostedServices/PythonGlobalInterpreterManager.cs
rename to src/modules/Elsa.Expressions.Python/HostedServices/PythonGlobalInterpreterManager.cs
index c00ea07e1..909ebd65c 100644
--- a/src/modules/Elsa.Scripting.Python/HostedServices/PythonGlobalInterpreterManager.cs
+++ b/src/modules/Elsa.Expressions.Python/HostedServices/PythonGlobalInterpreterManager.cs
@@ -1,10 +1,10 @@
-using Elsa.Scripting.Python.Options;
+using Elsa.Expressions.Python.Options;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Python.Runtime;
-namespace Elsa.Scripting.Python.HostedServices;
+namespace Elsa.Expressions.Python.HostedServices;
///
/// Initializes the Python engine.
diff --git a/src/modules/Elsa.Scripting.Python/Models/ExecutionContextProxy.cs b/src/modules/Elsa.Expressions.Python/Models/ExecutionContextProxy.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Python/Models/ExecutionContextProxy.cs
rename to src/modules/Elsa.Expressions.Python/Models/ExecutionContextProxy.cs
index 9389c9ff2..be3cabf20 100644
--- a/src/modules/Elsa.Scripting.Python/Models/ExecutionContextProxy.cs
+++ b/src/modules/Elsa.Expressions.Python/Models/ExecutionContextProxy.cs
@@ -3,7 +3,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
using JetBrains.Annotations;
-namespace Elsa.Scripting.Python.Models;
+namespace Elsa.Expressions.Python.Models;
///
/// Provides access to the current execution context.
diff --git a/src/modules/Elsa.Scripting.Python/Models/InputProxy.cs b/src/modules/Elsa.Expressions.Python/Models/InputProxy.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Python/Models/InputProxy.cs
rename to src/modules/Elsa.Expressions.Python/Models/InputProxy.cs
index 20197c734..4ddf95b36 100644
--- a/src/modules/Elsa.Scripting.Python/Models/InputProxy.cs
+++ b/src/modules/Elsa.Expressions.Python/Models/InputProxy.cs
@@ -3,7 +3,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
// ReSharper disable InconsistentNaming
-namespace Elsa.Scripting.Python.Models;
+namespace Elsa.Expressions.Python.Models;
///
/// A wrapper for accessing activity input values from Python.
diff --git a/src/modules/Elsa.Scripting.Python/Models/OutcomeProxy.cs b/src/modules/Elsa.Expressions.Python/Models/OutcomeProxy.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Python/Models/OutcomeProxy.cs
rename to src/modules/Elsa.Expressions.Python/Models/OutcomeProxy.cs
index 9ddeebd01..7c8fea1d5 100644
--- a/src/modules/Elsa.Scripting.Python/Models/OutcomeProxy.cs
+++ b/src/modules/Elsa.Expressions.Python/Models/OutcomeProxy.cs
@@ -1,7 +1,7 @@
using Elsa.Expressions.Models;
// ReSharper disable InconsistentNaming
-namespace Elsa.Scripting.Python.Models;
+namespace Elsa.Expressions.Python.Models;
///
/// Provides access to activity outcomes.
diff --git a/src/modules/Elsa.Scripting.Python/Models/OutputProxy.cs b/src/modules/Elsa.Expressions.Python/Models/OutputProxy.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Python/Models/OutputProxy.cs
rename to src/modules/Elsa.Expressions.Python/Models/OutputProxy.cs
index d1837aeef..b10b93043 100644
--- a/src/modules/Elsa.Scripting.Python/Models/OutputProxy.cs
+++ b/src/modules/Elsa.Expressions.Python/Models/OutputProxy.cs
@@ -3,7 +3,7 @@ using Elsa.Expressions.Models;
using Elsa.Extensions;
// ReSharper disable InconsistentNaming
-namespace Elsa.Scripting.Python.Models;
+namespace Elsa.Expressions.Python.Models;
///
/// Provides access to activity outputs.
diff --git a/src/modules/Elsa.Scripting.Python/Notifications/EvaluatingPython.cs b/src/modules/Elsa.Expressions.Python/Notifications/EvaluatingPython.cs
similarity index 95%
rename from src/modules/Elsa.Scripting.Python/Notifications/EvaluatingPython.cs
rename to src/modules/Elsa.Expressions.Python/Notifications/EvaluatingPython.cs
index a515eb9c9..c70fc4261 100644
--- a/src/modules/Elsa.Scripting.Python/Notifications/EvaluatingPython.cs
+++ b/src/modules/Elsa.Expressions.Python/Notifications/EvaluatingPython.cs
@@ -3,7 +3,7 @@ using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
using Python.Runtime;
-namespace Elsa.Scripting.Python.Notifications;
+namespace Elsa.Expressions.Python.Notifications;
///
/// This notification is published every time a Python expression is about to be evaluated, giving subscribers a chance to modify the Python engine.
diff --git a/src/modules/Elsa.Scripting.Python/Options/PythonOptions.cs b/src/modules/Elsa.Expressions.Python/Options/PythonOptions.cs
similarity index 97%
rename from src/modules/Elsa.Scripting.Python/Options/PythonOptions.cs
rename to src/modules/Elsa.Expressions.Python/Options/PythonOptions.cs
index 7ceddd7a8..3f128b5a6 100644
--- a/src/modules/Elsa.Scripting.Python/Options/PythonOptions.cs
+++ b/src/modules/Elsa.Expressions.Python/Options/PythonOptions.cs
@@ -2,7 +2,7 @@ using System.Text;
using JetBrains.Annotations;
using Python.Runtime;
-namespace Elsa.Scripting.Python.Options;
+namespace Elsa.Expressions.Python.Options;
///
/// Options for the Python expression evaluator.
diff --git a/src/modules/Elsa.Scripting.Python/Providers/PythonExpressionSyntaxProvider.cs b/src/modules/Elsa.Expressions.Python/Providers/PythonExpressionSyntaxProvider.cs
similarity index 87%
rename from src/modules/Elsa.Scripting.Python/Providers/PythonExpressionSyntaxProvider.cs
rename to src/modules/Elsa.Expressions.Python/Providers/PythonExpressionSyntaxProvider.cs
index 1fd0fe35c..b602ebaf0 100644
--- a/src/modules/Elsa.Scripting.Python/Providers/PythonExpressionSyntaxProvider.cs
+++ b/src/modules/Elsa.Expressions.Python/Providers/PythonExpressionSyntaxProvider.cs
@@ -1,10 +1,10 @@
using Elsa.Expressions.Contracts;
using Elsa.Expressions.Models;
using Elsa.Extensions;
-using Elsa.Scripting.Python.Expressions;
+using Elsa.Expressions.Python.Expressions;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Scripting.Python.Providers;
+namespace Elsa.Expressions.Python.Providers;
internal class PythonExpressionDescriptorProvider : IExpressionDescriptorProvider
{
diff --git a/src/modules/Elsa.Scripting.Python/Services/PythonNetPythonEvaluator.cs b/src/modules/Elsa.Expressions.Python/Services/PythonNetPythonEvaluator.cs
similarity index 93%
rename from src/modules/Elsa.Scripting.Python/Services/PythonNetPythonEvaluator.cs
rename to src/modules/Elsa.Expressions.Python/Services/PythonNetPythonEvaluator.cs
index 4ed94a5f9..f7ebe3b55 100644
--- a/src/modules/Elsa.Scripting.Python/Services/PythonNetPythonEvaluator.cs
+++ b/src/modules/Elsa.Expressions.Python/Services/PythonNetPythonEvaluator.cs
@@ -2,12 +2,12 @@ using System.Text;
using Elsa.Expressions.Helpers;
using Elsa.Expressions.Models;
using Elsa.Mediator.Contracts;
-using Elsa.Scripting.Python.Contracts;
-using Elsa.Scripting.Python.Models;
-using Elsa.Scripting.Python.Notifications;
+using Elsa.Expressions.Python.Contracts;
+using Elsa.Expressions.Python.Models;
+using Elsa.Expressions.Python.Notifications;
using Python.Runtime;
-namespace Elsa.Scripting.Python.Services;
+namespace Elsa.Expressions.Python.Services;
///
/// Evaluates Python expressions using IronPython.