diff --git a/moabb/datasets/__init__.py b/moabb/datasets/__init__.py
index 79ee1702f..1d129dfb9 100644
--- a/moabb/datasets/__init__.py
+++ b/moabb/datasets/__init__.py
@@ -57,13 +57,13 @@
 )
 from .epfl import EPFLP300
 from .erpcore2021 import (
-    Erpcore2021_ERN,
-    Erpcore2021_LRP,
-    Erpcore2021_MMN,
-    Erpcore2021_N2pc,
-    Erpcore2021_N170,
-    Erpcore2021_N400,
-    Erpcore2021_P3,
+    ErpCore2021_ERN,
+    ErpCore2021_LRP,
+    ErpCore2021_MMN,
+    ErpCore2021_N2Pc,
+    ErpCore2021_N170,
+    ErpCore2021_N400,
+    ErpCore2021_P3,
 )
 from .fake import FakeDataset, FakeVirtualRealityDataset
 from .gigadb import Cho2017
diff --git a/moabb/datasets/erpcore2021.py b/moabb/datasets/erpcore2021.py
index a8c438d47..0d676d61d 100644
--- a/moabb/datasets/erpcore2021.py
+++ b/moabb/datasets/erpcore2021.py
@@ -1,5 +1,5 @@
 """
-Erpcore2021 dataset
+ErpCore2021 dataset
 
 # Author: Taha Habib <tahahb123@gmail.com>
 
@@ -103,7 +103,7 @@
 """
 
 
-class Erpcore2021(BaseDataset):
+class ErpCore2021(BaseDataset):
     __doc__ = f"""Abstract base dataset class the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedures**:
@@ -165,7 +165,7 @@ def __init__(self, task):
             subjects=list(range(1, 40 + 1)),
             sessions_per_subject=1,
             events=events,
-            code=f"Erpcore2021-{task}",
+            code=f"ErpCore2021-{task}",
             interval=interval,
             paradigm="p300",
             doi="10.1016/j.neuroimage.2020.117465",
@@ -419,7 +419,7 @@ def encoding(self, events_df: pd.DataFrame):
         """
 
 
-class Erpcore2021_N170(Erpcore2021):
+class ErpCore2021_N170(ErpCore2021):
     __doc__ = f"""N170 events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -430,7 +430,7 @@ class Erpcore2021_N170(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "N170")
+    __init__ = partialmethod(ErpCore2021.__init__, "N170")
 
     @staticmethod
     def encode_event(row):
@@ -462,7 +462,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_MMN(Erpcore2021):
+class ErpCore2021_MMN(ErpCore2021):
     __doc__ = f"""MMN events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -473,7 +473,7 @@ class Erpcore2021_MMN(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "MMN")
+    __init__ = partialmethod(ErpCore2021.__init__, "MMN")
 
     @staticmethod
     def encode_event(row):
@@ -501,7 +501,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_N2pc(Erpcore2021):
+class ErpCore2021_N2Pc(ErpCore2021):
     __doc__ = f"""N2pc events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -511,7 +511,7 @@ class Erpcore2021_N2pc(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "N2pc")
+    __init__ = partialmethod(ErpCore2021.__init__, "N2pc")
 
     @staticmethod
     def encode_event(row):
@@ -560,7 +560,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_P3(Erpcore2021):
+class ErpCore2021_P3(ErpCore2021):
     __doc__ = f"""P3 events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -573,7 +573,7 @@ class Erpcore2021_P3(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "P3")
+    __init__ = partialmethod(ErpCore2021.__init__, "P3")
 
     @staticmethod
     # Keeping only the stimulus without the response
@@ -672,7 +672,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_N400(Erpcore2021):
+class ErpCore2021_N400(ErpCore2021):
     __doc__ = f"""N400 events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -682,7 +682,7 @@ class Erpcore2021_N400(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "N400")
+    __init__ = partialmethod(ErpCore2021.__init__, "N400")
 
     @staticmethod
     def encode_event(row):
@@ -722,7 +722,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_ERN(Erpcore2021):
+class ErpCore2021_ERN(ErpCore2021):
     __doc__ = f"""ERN events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -733,7 +733,7 @@ class Erpcore2021_ERN(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "ERN")
+    __init__ = partialmethod(ErpCore2021.__init__, "ERN")
 
     @staticmethod
     def encode_event(row):
@@ -804,7 +804,7 @@ def encoding(self, events_df):
         return encoded_column.values, mapping
 
 
-class Erpcore2021_LRP(Erpcore2021):
+class ErpCore2021_LRP(ErpCore2021):
     __doc__ = f"""LRP events of the ERP CORE dataset by Kappenman et al. 2020.
     {_docstring_head}
     **Experimental procedure**:
@@ -815,7 +815,7 @@ class Erpcore2021_LRP(Erpcore2021):
     {_docstring_tail}
     """
 
-    __init__ = partialmethod(Erpcore2021.__init__, "LRP")
+    __init__ = partialmethod(ErpCore2021.__init__, "LRP")
 
     @staticmethod
     def encode_event(row):
diff --git a/moabb/datasets/summary_p300.csv b/moabb/datasets/summary_p300.csv
index e144c85df..b7b71ea9e 100644
--- a/moabb/datasets/summary_p300.csv
+++ b/moabb/datasets/summary_p300.csv
@@ -15,10 +15,10 @@ Sosulski2019, 13, 31, 7500 NT / 1500 T, 1.2s, 1000Hz, 1,https://paperswithcode.c
 EPFLP300, 8, 32, 2753 NT / 551 T, 1s, 2048Hz, 4,https://paperswithcode.com/dataset/epflp300-moabb
 Lee2019_ERP, 54, 62, 6900 NT / 1380 T, 1s, 1000Hz, 2,https://paperswithcode.com/dataset/lee2019-erp-moabb-1
 DemonsP300, 60, 8, 935 NT / 50 T, 1s, 500Hz, 1,
-Erpcore2021_N170, 40, 30, 240 NT / 80 T , 1s, 1024Hz, 1,
-Erpcore2021_MMN, 40, 30, 800 NT / 200 T, 1s, 1024Hz, 1,
-Erpcore2021_N2pc, 40, 30, 160 NT / 160 T, 1s, 1024Hz, 1,
-Erpcore2021_P3, 40, 30, 160 NT / 40 T, 1s, 1024Hz, 1,
-Erpcore2021_N400, 40, 30, 60 NT / 60 T, 1s, 1024Hz, 1,
-Erpcore2021_ERN, 40, 30, ~400 All, 1s, 1024Hz, 1,
-Erpcore2021_LRP, 40, 30, ~400 All, 1s, 1024Hz, 1,
+ErpCore2021_N170, 40, 30, 240 NT / 80 T , 1s, 1024Hz, 1,
+ErpCore2021_MMN, 40, 30, 800 NT / 200 T, 1s, 1024Hz, 1,
+ErpCore2021_N2Pc, 40, 30, 160 NT / 160 T, 1s, 1024Hz, 1,
+ErpCore2021_P3, 40, 30, 160 NT / 40 T, 1s, 1024Hz, 1,
+ErpCore2021_N400, 40, 30, 60 NT / 60 T, 1s, 1024Hz, 1,
+ErpCore2021_ERN, 40, 30, ~400 All, 1s, 1024Hz, 1,
+ErpCore2021_LRP, 40, 30, ~400 All, 1s, 1024Hz, 1,