diff --git a/README.md b/README.md
index 26420b0..6a43dc7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This package is an AiiDA plugin allowing you to run python code as `CalcJob` on
 ```from aiida.orm import (Int, Float, Str, List, ArrayData)
 from aiida.plugins import CalculationFactory
 
-CalcJobPython = CalculationFactory("aiida_python.calc")
+CalcJobPython = CalculationFactory("python.calc")
 
 class ClassThatCannotStartWithTestExample(CalcJobPython):
 
diff --git a/aiida_python/calc.py b/aiida_python/calc.py
index c3eaeac..2ee30a2 100644
--- a/aiida_python/calc.py
+++ b/aiida_python/calc.py
@@ -32,7 +32,7 @@ def define(cls, spec):
                    help='Dont leave this empty')
 
         spec.inputs['metadata']['options'][
-            'parser_name'].default = 'aiida-python.parser'
+            'parser_name'].default = 'python.parser'
         spec.inputs['metadata']['options'][
             'input_filename'].default = '__noone_will_ever_use_this_name.input'
         spec.inputs['metadata']['options'][
diff --git a/example/example_diagonalization.py b/example/example_diagonalization.py
index 20f1770..911a1f0 100644
--- a/example/example_diagonalization.py
+++ b/example/example_diagonalization.py
@@ -5,7 +5,7 @@
 import pytest
 import numpy as np
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 
 class ClassThatCannotStartWithTestLastTime(CalcJobPython):
@@ -87,11 +87,11 @@ def test_diagonalize_hamiltonian(aiida_local_code_factory, clear_database):
     # Add entry point
 
     entry_points.add(group='aiida.calculations',
-                     name='aiida-python.example.calc_diag',
+                     name='python.example.calc_diag',
                      value=ClassThatCannotStartWithTestLastTime)
 
     executable = 'python3'
-    entry_point = 'aiida-python.example.calc_diag'
+    entry_point = 'python.example.calc_diag'
 
     code = aiida_local_code_factory(entry_point=entry_point,
                                     executable=executable)
diff --git a/example/gol/goleval.py b/example/gol/goleval.py
index e0fccc8..993f5c2 100644
--- a/example/gol/goleval.py
+++ b/example/gol/goleval.py
@@ -9,7 +9,7 @@
     DataFactory,
 )
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 
 class GOLEval(CalcJobPython):
diff --git a/setup.json b/setup.json
index c5be2d0..7dcc74e 100644
--- a/setup.json
+++ b/setup.json
@@ -15,10 +15,10 @@
     "version": "0.0.6",
     "entry_points": {
         "aiida.calculations": [
-            "aiida-python.calc = aiida_python.calc:CalcJobPython"
+            "python.calc = aiida_python.calc:CalcJobPython"
         ],
         "aiida.parsers": [
-            "aiida-python.parser = aiida_python.parser:ParserPython"
+            "python.parser = aiida_python.parser:ParserPython"
         ],
         "aiida_python.serializers": [
             "int = aiida_python.serializers:SerializerInt",
diff --git a/tests/test_copyfile.py b/tests/test_copyfile.py
index 128b6f4..d63b223 100644
--- a/tests/test_copyfile.py
+++ b/tests/test_copyfile.py
@@ -3,7 +3,7 @@
 from aiida.plugins import CalculationFactory
 import pytest
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 SUCCESS_MSG = 'Succesfull run'
 
diff --git a/tests/test_example.py b/tests/test_example.py
index a38455c..ea1e8ff 100644
--- a/tests/test_example.py
+++ b/tests/test_example.py
@@ -3,7 +3,7 @@
 from aiida.plugins import CalculationFactory
 import pytest
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 
 class ClassThatCannotStartWithTestExample(CalcJobPython):
diff --git a/tests/test_exception.py b/tests/test_exception.py
index d710b57..0ad05bc 100644
--- a/tests/test_exception.py
+++ b/tests/test_exception.py
@@ -2,7 +2,7 @@
 from aiida.orm import (Int, Float, Str, List, ArrayData)
 from aiida.plugins import CalculationFactory
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 
 class ClassThatCannotStartWithTestException(CalcJobPython):
diff --git a/tests/test_simple_code.py b/tests/test_simple_code.py
index 8d4fb93..cfe57b6 100644
--- a/tests/test_simple_code.py
+++ b/tests/test_simple_code.py
@@ -2,7 +2,7 @@
 from aiida.orm import (Int, Float, Str, List, ArrayData)
 from aiida.plugins import CalculationFactory
 
-CalcJobPython = CalculationFactory('aiida-python.calc')
+CalcJobPython = CalculationFactory('python.calc')
 
 
 class ClassThatCannotStartWithTestInt(CalcJobPython):