diff --git a/src/main/scala/SpinalRiscv/Plugin/MachineCsr.scala b/src/main/scala/SpinalRiscv/Plugin/CsrPlugin.scala
similarity index 99%
rename from src/main/scala/SpinalRiscv/Plugin/MachineCsr.scala
rename to src/main/scala/SpinalRiscv/Plugin/CsrPlugin.scala
index 86f9f67..c06c43c 100644
--- a/src/main/scala/SpinalRiscv/Plugin/MachineCsr.scala
+++ b/src/main/scala/SpinalRiscv/Plugin/CsrPlugin.scala
@@ -62,7 +62,7 @@ case class CsrMapping(){
 
 
 
-class MachineCsr(config : MachineCsrConfig) extends Plugin[VexRiscv] with ExceptionService with PrivilegeService{
+class CsrPlugin(config : MachineCsrConfig) extends Plugin[VexRiscv] with ExceptionService with PrivilegeService{
   import config._
   import CsrAccess._
 
diff --git a/src/main/scala/SpinalRiscv/TopLevel.scala b/src/main/scala/SpinalRiscv/TopLevel.scala
index 3d4fef1..db85bbe 100644
--- a/src/main/scala/SpinalRiscv/TopLevel.scala
+++ b/src/main/scala/SpinalRiscv/TopLevel.scala
@@ -176,7 +176,7 @@ object TopLevel {
   //        new HazardSimplePlugin(false, false, false, false),
           new MulPlugin,
           new DivPlugin,
-          new MachineCsr(csrConfigAll),
+          new CsrPlugin(csrConfigAll),
           new BranchPlugin(
             earlyBranch = false,
             catchAddressMisaligned = true,
@@ -304,7 +304,7 @@ object TopLevel {
             virtualRange = _(31 downto 28) === 0xC,
             ioRange      = _(31 downto 28) === 0xF
           ),
-          new MachineCsr(csrConfigSmall),
+          new CsrPlugin(csrConfigSmall),
           new DecoderSimplePlugin(
             catchIllegalInstruction = false
           ),