diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json
index 614988908..04680dc44 100644
--- a/kratos.gid/apps/MPM/app.json
+++ b/kratos.gid/apps/MPM/app.json
@@ -3,9 +3,9 @@
     "name": "MPM",
     "prefix": "MPM",
     "themed": false,
-    "kratos_name": "ParticleMechanicsApplication",
+    "kratos_name": "MPMApplication",
     "python_packages": [
-        "KratosParticleMechanicsApplication",
+        "KratosMPMApplication",
         "KratosLinearSolversApplication"
     ],
     "dimensions": [
diff --git a/kratos.gid/apps/MPM/examples/CantileverBeam.tcl b/kratos.gid/apps/MPM/examples/CantileverBeam.tcl
index 63d741bfa..ce4fcd84c 100644
--- a/kratos.gid/apps/MPM/examples/CantileverBeam.tcl
+++ b/kratos.gid/apps/MPM/examples/CantileverBeam.tcl
@@ -127,7 +127,7 @@ proc ::MPM::examples::CantileverBeam::TreeAssignation2D {args} {
     set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route HyperelasticBeam]
     $mpm_solid_part setAttribute ov surface
     set constitutive_law_name "HyperElasticNeoHookeanPlaneStrain${nd}Law"
-    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material HyperelasticBeam DENSITY 1000 YOUNG_MODULUS 90000000 POISSON_RATIO 0.49 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
+    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material HyperelasticBeam DENSITY 1000 YOUNG_MODULUS 90000000 POISSON_RATIO 0.49 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
     spdAux::SetValuesOnBaseNode $mpm_solid_part $props
 
     ## Grid
diff --git a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl
index 47cc81446..ea02008e6 100644
--- a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl
+++ b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl
@@ -114,7 +114,7 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} {
     set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route Sand]
     $mpm_solid_part setAttribute ov surface
     set constitutive_law_name "HenckyMCPlasticPlaneStrain${nd}Law"
-    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material Sand DENSITY 2300 YOUNG_MODULUS 6e6 POISSON_RATIO 0.3 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
+    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material Sand DENSITY 2300 YOUNG_MODULUS 6e6 POISSON_RATIO 0.3 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
     spdAux::SetValuesOnBaseNode $mpm_solid_part $props
 
     ## Grid
diff --git a/kratos.gid/apps/MPM/examples/GranularFlow.tcl b/kratos.gid/apps/MPM/examples/GranularFlow.tcl
index 0dd2ba2c5..ada892092 100644
--- a/kratos.gid/apps/MPM/examples/GranularFlow.tcl
+++ b/kratos.gid/apps/MPM/examples/GranularFlow.tcl
@@ -127,7 +127,7 @@ proc ::MPM::examples::GranularFlow::TreeAssignation2D {args} {
     set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route GranularMaterial]
     $mpm_solid_part setAttribute ov surface
     set constitutive_law_name "HenckyMCPlasticPlaneStrain${nd}Law"
-    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material GranularMaterial DENSITY 2650 YOUNG_MODULUS 840000 POISSON_RATIO 0.3 INTERNAL_FRICTION_ANGLE 19.8 THICKNESS 0.1 PARTICLES_PER_ELEMENT 3]
+    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material GranularMaterial DENSITY 2650 YOUNG_MODULUS 840000 POISSON_RATIO 0.3 INTERNAL_FRICTION_ANGLE 19.8 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 3]
     spdAux::SetValuesOnBaseNode $mpm_solid_part $props
 
     ## Grid
diff --git a/kratos.gid/apps/MPM/examples/StaticCantileverBeam.tcl b/kratos.gid/apps/MPM/examples/StaticCantileverBeam.tcl
index d64afd43c..5497158eb 100644
--- a/kratos.gid/apps/MPM/examples/StaticCantileverBeam.tcl
+++ b/kratos.gid/apps/MPM/examples/StaticCantileverBeam.tcl
@@ -132,7 +132,7 @@ proc ::MPM::examples::StaticCantileverBeam::TreeAssignation2D {args} {
     set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route LinearElasticBeam]
     $mpm_solid_part setAttribute ov surface
     set constitutive_law_name "LinearElasticIsotropicPlaneStrain{nd}Law"
-    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material LinearElasticBeam DENSITY 7850 YOUNG_MODULUS 206.9e9 POISSON_RATIO 0.29 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
+    set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material LinearElasticBeam DENSITY 7850 YOUNG_MODULUS 206.9e9 POISSON_RATIO 0.29 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
     spdAux::SetValuesOnBaseNode $mpm_solid_part $props
 
     ## Grid
diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl
index 80c488f6a..cb9014861 100644
--- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl
+++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl
@@ -3,7 +3,7 @@ proc ::MPM::write::getParametersDict { } {
     set project_parameters_dict [Structural::write::getParametersDict]
 
     # Analysis stage field
-    dict set project_parameters_dict analysis_stage "KratosMultiphysics.ParticleMechanicsApplication.particle_mechanics_analysis"
+    dict set project_parameters_dict analysis_stage "KratosMultiphysics.MPMApplication.mpm_analysis"
 
     # Quasi-static must be written as Quasi-static...
     set solutiontype [write::getValue STSoluType]
@@ -98,9 +98,9 @@ proc ::MPM::write::getParametersDict { } {
     set activate_gravity [write::getValue ActivateGravity]
     if {$activate_gravity eq "On"} {
         set gravity_dict [dict create ]
-        dict set gravity_dict python_module assign_gravity_to_particle_process
-        dict set gravity_dict kratos_module "KratosMultiphysics.ParticleMechanicsApplication"
-        dict set gravity_dict process_name AssignGravityToParticleProcess
+        dict set gravity_dict python_module assign_gravity_to_material_point_process
+        dict set gravity_dict kratos_module "KratosMultiphysics.MPMApplication"
+        dict set gravity_dict process_name AssignGravityToMaterialPointProcess
         set gravity_parameters_dict [dict create ]
         dict set gravity_parameters_dict model_part_name MPM_Material
         dict set gravity_parameters_dict variable_name MP_VOLUME_ACCELERATION
@@ -156,9 +156,9 @@ proc ::MPM::write::GetOutputProcessesList { } {
 
          set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0]
          set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0]
-         dict set body_output_configuration_dict python_module particle_gid_output_process
-         dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication
-         dict set body_output_configuration_dict process_name ParticleMPMGiDOutputProcess
+         dict set body_output_configuration_dict python_module mpm_gid_output_process
+         dict set body_output_configuration_dict kratos_module KratosMultiphysics.MPMApplication
+         dict set body_output_configuration_dict process_name MPMGiDOutputProcess
          dict set body_output_configuration_dict Parameters model_part_name MPM_Material
          dict set grid_output_configuration_dict Parameters model_part_name Background_Grid
          dict set body_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings model_import_settings input_filename]
@@ -188,9 +188,9 @@ proc ::MPM::write::GetOutputProcessesList { } {
          set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0]
 
 
-         dict set body_output_configuration_dict python_module particle_vtk_output_process
-         dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication
-         dict set body_output_configuration_dict process_name ParticleVtkOutputProcess
+         dict set body_output_configuration_dict python_module mpm_vtk_output_process
+         dict set body_output_configuration_dict kratos_module KratosMultiphysics.MPMApplication
+         dict set body_output_configuration_dict process_name MPMVtkOutputProcess
          dict set body_output_configuration_dict Parameters model_part_name MPM_Material
          dict unset body_output_configuration_dict Parameters nodal_data_value_variables
          dict unset body_output_configuration_dict Parameters element_data_value_variables
diff --git a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml
index 7a9b9679a..27c9bd31a 100644
--- a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml
+++ b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml
@@ -5,9 +5,9 @@
 <!-- Currently Available in Release Version -->
 <!-- ######################################## -->
 
-<!-- Currently Available in ParticleMechanicsApplication -->
+<!-- Currently Available in MPMApplication -->
   <!--linear elastic laws-->
-  <CLaw n="LinearElasticIsotropicPlaneStrain2DLaw" pn="Linear Elastic (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="ParticleMechanicsApplication" help="Linear Elastic Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible"  ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="LinearElasticIsotropicPlaneStrain2DLaw" pn="Linear Elastic (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="MPMApplication" help="Linear Elastic Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible"  ImplementedInApplication="MPMApplication" >
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -16,7 +16,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="LinearElasticIsotropicPlaneStress2DLaw" pn="Linear Elastic (Plane Stress)" Type="PlaneStress" LargeDeformation="False" kratos_module="ParticleMechanicsApplication" help="Linear Elastic Behaviour in 2D Plane Stress" Dimension="2D"  App="MPM" FormulationType="Irreducible"  ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="LinearElasticIsotropicPlaneStress2DLaw" pn="Linear Elastic (Plane Stress)" Type="PlaneStress" LargeDeformation="False" kratos_module="MPMApplication" help="Linear Elastic Behaviour in 2D Plane Stress" Dimension="2D"  App="MPM" FormulationType="Irreducible"  ImplementedInApplication="MPMApplication" >
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -26,9 +26,9 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="LinearElasticIsotropicAxisym2DLaw" pn="Linear Elastic" Type="Axisymmetric" LargeDeformation="False" kratos_module="ParticleMechanicsApplication"
+  <CLaw n="LinearElasticIsotropicAxisym2DLaw" pn="Linear Elastic" Type="Axisymmetric" LargeDeformation="False" kratos_module="MPMApplication"
 
-  help="Linear Elastic Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" >
+  help="Linear Elastic Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication" >
 
     <inputs>
         <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -39,7 +39,7 @@
   </CLaw>
 
 
-  <CLaw n="LinearElasticIsotropic3DLaw" pn="Linear Elastic" Type="3D" LargeDeformation="False" kratos_module="ParticleMechanicsApplication" help="Linear Elastic Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="LinearElasticIsotropic3DLaw" pn="Linear Elastic" Type="3D" LargeDeformation="False" kratos_module="MPMApplication" help="Linear Elastic Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -50,7 +50,7 @@
   </CLaw>
 
   <!--hyper elastic laws-->
-  <CLaw n="HyperElasticNeoHookeanPlaneStrain2DLaw" pn="Hyperelastic NeoHookean (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="ParticleMechanicsApplication" help="Hyperelastic Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HyperElasticNeoHookeanPlaneStrain2DLaw" pn="Hyperelastic NeoHookean (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="MPMApplication" help="Hyperelastic Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -59,8 +59,8 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HyperElasticNeoHookeanAxisym2DLaw" pn="Hyperelastic NeoHookean" Type="Axisymmetric" LargeDeformation="False" kratos_module="ParticleMechanicsApplication"
-  help="Hyperelastic Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="HyperElasticNeoHookeanAxisym2DLaw" pn="Hyperelastic NeoHookean" Type="Axisymmetric" LargeDeformation="False" kratos_module="MPMApplication"
+  help="Hyperelastic Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication" >
 
     <inputs>
         <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -70,7 +70,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HyperElasticNeoHookean3DLaw" pn="Hyperelastic NeoHookean" Type="3D" LargeDeformation="False" kratos_module="ParticleMechanicsApplication" help="HyperElastic Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HyperElasticNeoHookean3DLaw" pn="Hyperelastic NeoHookean" Type="3D" LargeDeformation="False" kratos_module="MPMApplication" help="HyperElastic Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -80,7 +80,7 @@
     <outputs></outputs>
   </CLaw>
 
-   <CLaw n="HyperElasticNeoHookeanPlaneStrainUP2DLaw" pn="Hyperelastic NeoHookean (Plane Strain) " Type="PlaneStrain" LargeDeformation="False"  kratos_module="ParticleMechanicsApplication" help="Hyperelastic Behaviour in 2D Plane Strain for the mixed formulation" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Mixed" ImplementedInApplication="ParticleMechanicsApplication">
+   <CLaw n="HyperElasticNeoHookeanPlaneStrainUP2DLaw" pn="Hyperelastic NeoHookean (Plane Strain) " Type="PlaneStrain" LargeDeformation="False"  kratos_module="MPMApplication" help="Hyperelastic Behaviour in 2D Plane Strain for the mixed formulation" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Mixed" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -90,7 +90,7 @@
   </CLaw>
 
 
-    <CLaw n="HyperElasticNeoHookeanUP3DLaw" pn="Hyperelastic NeoHookean " Type="3D" LargeDeformation="False" kratos_module="ParticleMechanicsApplication" help="HyperElastic Behaviour in 3D for mixed formulation" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Mixed" ImplementedInApplication="ParticleMechanicsApplication">
+    <CLaw n="HyperElasticNeoHookeanUP3DLaw" pn="Hyperelastic NeoHookean " Type="3D" LargeDeformation="False" kratos_module="MPMApplication" help="HyperElastic Behaviour in 3D for mixed formulation" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Mixed" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -101,7 +101,7 @@
 
 
   <!-- Mohr Coulomb -->
-  <CLaw n="HenckyMCPlasticPlaneStrain2DLaw" pn="Mohr Coulomb" class="HenckyMCPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Mohr Coulomb Plasticity Behaviour in 2D Plane Strain" Dimension="2D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyMCPlasticPlaneStrain2DLaw" pn="Mohr Coulomb" class="HenckyMCPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="MPMApplication" help="Mohr Coulomb Plasticity Behaviour in 2D Plane Strain" Dimension="2D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -114,8 +114,8 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyMCPlasticAxisym2DLaw" pn="Mohr Coulomb" class="HenckyMCPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="ParticleMechanicsApplication"
-  help="Mohr Coulomb Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible"  ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="HenckyMCPlasticAxisym2DLaw" pn="Mohr Coulomb" class="HenckyMCPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="MPMApplication"
+  help="Mohr Coulomb Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible"  ImplementedInApplication="MPMApplication" >
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -127,7 +127,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyMCPlastic3DLaw" pn="Mohr Coulomb" class="HenckyMCPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Mohr Coulomb Plasticity Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyMCPlastic3DLaw" pn="Mohr Coulomb" class="HenckyMCPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="MPMApplication" help="Mohr Coulomb Plasticity Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -140,7 +140,7 @@
   </CLaw>
 
   <!-- Mohr Coulomb Strain Softening -->
-  <CLaw n="HenckyMCStrainSofteningPlasticPlaneStrain2DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyMCStrainSofteningPlasticPlaneStrain2DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="MPMApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Plane Strain" Dimension="2D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -157,7 +157,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyMCStrainSofteningPlasticAxisym2DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Axis-symmetric" Dimension="2Da"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="HenckyMCStrainSofteningPlasticAxisym2DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="MPMApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Axis-symmetric" Dimension="2Da"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication" >
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -173,7 +173,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyMCStrainSofteningPlastic3DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyMCStrainSofteningPlastic3DLaw" pn="Mohr Coulomb Strain Softening" class="HenckyMCStrainSofteningPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="MPMApplication" help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 3D" Dimension="3D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="YOUNG_MODULUS" pn="Young Modulus" unit_magnitude="P" units="Pa" v="206.9e9" />
@@ -190,7 +190,7 @@
   </CLaw>
 
   <!-- Borja Modified Cam Clay -->
-  <CLaw n="HenckyBorjaCamClayPlasticPlaneStrain2DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Modified Cam Clay Plasticity Behaviour in 2D Plane Strain" Dimension="2D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyBorjaCamClayPlasticPlaneStrain2DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlasticPlaneStrain2DLaw" Type="2D" LargeDeformation="True" kratos_module="MPMApplication" help="Modified Cam Clay Plasticity Behaviour in 2D Plane Strain" Dimension="2D"  App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -205,8 +205,8 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyBorjaCamClayPlasticAxisym2DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="ParticleMechanicsApplication"
-  help="Modified Cam Clay Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" >
+  <CLaw n="HenckyBorjaCamClayPlasticAxisym2DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlasticAxisym2DLaw" Type="Axisymmetric" LargeDeformation="True" kratos_module="MPMApplication"
+  help="Modified Cam Clay Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication" >
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
       <parameter n="PRE_CONSOLIDATION_STRESS" pn="Preconsolidation pressure" unit_magnitude="P" units="Pa" v="-90.e3" help="Historically maximum effective overburden stress." />
@@ -220,7 +220,7 @@
     <outputs></outputs>
   </CLaw>
 
-  <CLaw n="HenckyBorjaCamClayPlastic3DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="ParticleMechanicsApplication" help="Modified Cam Clay Plasticity Behaviour in 3D" Dimension="3D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+  <CLaw n="HenckyBorjaCamClayPlastic3DLaw" pn="Modified Cam Clay" class="HenckyBorjaCamClayPlastic3DLaw" Type="3D" LargeDeformation="True" kratos_module="MPMApplication" help="Modified Cam Clay Plasticity Behaviour in 3D" Dimension="3D" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
 
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="7850"/>
@@ -234,7 +234,7 @@
     </inputs>
     <outputs></outputs>
   </CLaw>
-   <CLaw n="DispNewtonianFluidPlaneStrain2DLaw" pn="Newtonian Fluid (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="ParticleMechanicsApplication" help="Newtonian Fluid in 2D Plane Strain" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+   <CLaw n="DispNewtonianFluidPlaneStrain2DLaw" pn="Newtonian Fluid (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="MPMApplication" help="Newtonian Fluid in 2D Plane Strain" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1000"/>
       <parameter n="BULK_MODULUS" pn="Bulk Modulus" unit_magnitude="P" units="Pa" v="2e6" />
@@ -243,7 +243,7 @@
     <outputs></outputs>
   </CLaw>
   
-   <CLaw n="DispNewtonianFluid3DLaw" pn="Newtonian Fluid (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="ParticleMechanicsApplication" help="Newtonian Fluid in 3D Plane Strain" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication">
+   <CLaw n="DispNewtonianFluid3DLaw" pn="Newtonian Fluid (Plane Strain)" Type="PlaneStrain" LargeDeformation="False"  kratos_module="MPMApplication" help="Newtonian Fluid in 3D Plane Strain" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="MPMApplication">
     <inputs>
       <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1000"/>
       <parameter n="BULK_MODULUS" pn="Bulk Modulus" unit_magnitude="P" units="Pa" v="2e6" />
diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml
index 1e1f89f22..2b525d42e 100644
--- a/kratos.gid/apps/MPM/xml/Elements.xml
+++ b/kratos.gid/apps/MPM/xml/Elements.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ElementList>
   <!--updated lagrangian-->
-  <ElementItem n="MPMUpdatedLagrangian2D" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="MPMUpdatedLagrangian2D" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="MPMApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="MPMUpdatedLagrangian2D3N"/>
@@ -20,7 +20,7 @@
     </NodalConditions>
     <inputs>
       <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
+      <parameter n="MATERIAL_POINTS_PER_ELEMENT" pn="Material points per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of material points generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -32,7 +32,7 @@
     </outputs>
   </ElementItem>
   <!--updated lagrangian mixed UP-->
-  <ElementItem n="MPMUpdatedLagrangianUP2D" pn="Updated lagrangian mixed UP" ov="surface" ImplementedInFile="updated_lagrangian_UP.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian mixed formulation UP 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="MPMUpdatedLagrangianUP2D" pn="Updated lagrangian mixed UP" ov="surface" ImplementedInFile="updated_lagrangian_UP.cpp" ImplementedInApplication="MPMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian mixed formulation UP 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="MPMUpdatedLagrangianUP2D3N"/>
@@ -51,7 +51,7 @@
     </NodalConditions>
     <inputs>
       <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particle per element" type="integer" v="1" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
+      <parameter n="MATERIAL_POINTS_PER_ELEMENT" pn="Material points per element" type="integer" v="1" help="Number of material points generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -62,7 +62,7 @@
       <parameter n="MP_EQUIVALENT_PLASTIC_STRAIN" pn="Material point equivalent plastic strain" v="false" />
     </outputs>
   </ElementItem>
-  <ElementItem n="MPMUpdatedLagrangian2DAxisymmetry" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian_axisymmetry.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" WorkingSpaceDimension="2Da" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D axis-symmetric element for large deformation kinematics consist of a material point and connectivity nodes" AnalysisType="non_linear,linear">
+  <ElementItem n="MPMUpdatedLagrangian2DAxisymmetry" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian_axisymmetry.cpp" ImplementedInApplication="MPMApplication" MinimumKratosVersion="9000" WorkingSpaceDimension="2Da" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D axis-symmetric element for large deformation kinematics consist of a material point and connectivity nodes" AnalysisType="non_linear,linear">
 
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
@@ -82,7 +82,7 @@
     </NodalConditions>
     <inputs>
       <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
+      <parameter n="MATERIAL_POINTS_PER_ELEMENT" pn="Material points per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of material points generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -94,7 +94,7 @@
     </outputs>
   </ElementItem>
 
-  <ElementItem n="MPMUpdatedLagrangian3D" pn="Updated lagrangian" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="False" LargeDeformation="False" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="MPMUpdatedLagrangian3D" pn="Updated lagrangian" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="MPMApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="False" LargeDeformation="False" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="MPMUpdatedLagrangian3D4N"/>
@@ -112,7 +112,7 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particle per element" type="integer" v="1" help="Number of particle generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
+      <parameter n="MATERIAL_POINTS_PER_ELEMENT" pn="Material points per element" type="integer" v="1" help="Number of material points generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -123,7 +123,7 @@
       <parameter n="MP_EQUIVALENT_PLASTIC_STRAIN" pn="Material point equivalent plastic strain" v="false" />
     </outputs>
   </ElementItem>
-   <ElementItem n="MPMUpdatedLagrangianUP3D" pn="Updated lagrangian mixed UP" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
+   <ElementItem n="MPMUpdatedLagrangianUP3D" pn="Updated lagrangian mixed UP" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="MPMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="MPMUpdatedLagrangian3D4N"/>
@@ -141,7 +141,7 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
+      <parameter n="MATERIAL_POINTS_PER_ELEMENT" pn="Material points per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of material points generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -154,7 +154,7 @@
   </ElementItem>
 
   <!--background grid-->
-  <ElementItem n="GRID2D" pn="Background Grid" ov="surface" ImplementedInApplication="ParticleMechanicsApplication" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="2D Background element required for the computation of material point method." AnalysisType="non_linear,linear">
+  <ElementItem n="GRID2D" pn="Background Grid" ov="surface" ImplementedInApplication="MPMApplication" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="2D Background element required for the computation of material point method." AnalysisType="non_linear,linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="Element2D3N"/>
@@ -173,7 +173,7 @@
     <inputs></inputs>
     <outputs></outputs>
   </ElementItem>
-  <ElementItem n="GRID2D" pn="Background Grid" ov="surface" ImplementedInApplication="ParticleMechanicsApplication" WorkingSpaceDimension="2Da" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="2D axis-symmetric Background element required for the computation of material point method." AnalysisType="non_linear">
+  <ElementItem n="GRID2D" pn="Background Grid" ov="surface" ImplementedInApplication="MPMApplication" WorkingSpaceDimension="2Da" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="2D axis-symmetric Background element required for the computation of material point method." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="Element2D3N"/>
@@ -192,7 +192,7 @@
     <inputs></inputs>
     <outputs></outputs>
   </ElementItem>
-  <ElementItem n="GRID3D" pn="Background Grid" ov="volume" ImplementedInApplication="ParticleMechanicsApplication" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="3D Background element required for the computation of material point method." AnalysisType="non_linear">
+  <ElementItem n="GRID3D" pn="Background Grid" ov="volume" ImplementedInApplication="MPMApplication" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="3D Background element required for the computation of material point method." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="Element3D4N"/>
diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd
index 98aca659e..3d237ffa4 100644
--- a/kratos.gid/apps/MPM/xml/Main.spd
+++ b/kratos.gid/apps/MPM/xml/Main.spd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <container n="MPM" pn="Particle Mechanics" icon="app" prefix="MPM" tree_state="open" open_window="0">
+  <container n="MPM" pn="Material Point Method" icon="app" prefix="MPM" tree_state="open" open_window="0">
     <include n="StageInfo" active="1" path="apps/MPM/xml/StageInfo.spd"/>
     <include n="Parts" active="1" path="apps/MPM/xml/Parts.spd"/>
     <include n="BoundaryConditions" active="1" path="apps/MPM/xml/BoundaryConditions.spd"/>
diff --git a/kratos.gid/apps/MPM/xml/Parts.spd b/kratos.gid/apps/MPM/xml/Parts.spd
index 98ee8525d..d88d77dd4 100644
--- a/kratos.gid/apps/MPM/xml/Parts.spd
+++ b/kratos.gid/apps/MPM/xml/Parts.spd
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <container  n="Parts" pn="Parts" un="STParts,MPMParts" icon="shells16" update_proc="UpdateParts">
-	<dynamicnode command="spdAux::injectPartsByElementType" args="ImplementedInApplication ParticleMechanicsApplication"/>
+	<dynamicnode command="spdAux::injectPartsByElementType" args="ImplementedInApplication MPMApplication"/>
 </container>
diff --git a/kratos.gid/apps/MPM/xml/Processes.xml b/kratos.gid/apps/MPM/xml/Processes.xml
index 5372fa49f..c9dbd5bd1 100644
--- a/kratos.gid/apps/MPM/xml/Processes.xml
+++ b/kratos.gid/apps/MPM/xml/Processes.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessList>
- 
-  <!-- Processes for particle mechanics -->
+
+  <!-- Processes for material point method -->
   <Process n="MPMDisplacementProcess" pn="MPMDisplacementProcess" python_module="assign_vector_variable_process"
-	   kratos_module="KratosMultiphysics" help="" > 
+	   kratos_module="KratosMultiphysics" help="" >
     <inputs>
       <parameter n="Displacement" pn="Displacement" enabled="1" function="0" type="vector" vectorType="double" v="0,0,0"/>
     </inputs>
-  </Process>  
+  </Process>
   <Process n="ApplyMPMSlipBoundaryProcess" pn="ApplyMPMSlipBoundaryProcess" python_module="apply_mpm_slip_boundary_process"
-	   kratos_module="KratosMultiphysics.ParticleMechanicsApplication" help="" > 
+	   kratos_module="KratosMultiphysics.MPMApplication" help="" >
     <inputs>
     </inputs>
   </Process>
diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl
index ab6b2ec3e..707ebc6f7 100644
--- a/kratos.gid/apps/MPM/xml/XmlController.tcl
+++ b/kratos.gid/apps/MPM/xml/XmlController.tcl
@@ -19,7 +19,7 @@ proc MPM::xml::Init { } {
     foreach strategy $::Model::SolutionStrategies {
         $strategy setAttribute NeedElements false
         foreach scheme [$strategy getSchemes] {
-            $scheme addElementFilter ImplementedInApplication ParticleMechanicsApplication
+            $scheme addElementFilter ImplementedInApplication MPMApplication
         }
     }