diff --git a/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala b/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
index d38cddbe094bee76f0f00253c038c78e2be9bcde..ea5c43003aa1d8a928dac9bd2e1019e244fa7676 100644
--- a/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
@@ -6,10 +6,10 @@ import org.{ json4s => jn }
 import scala.collection.breakOut
 
 object OctopusParser extends SimpleExternalParserGenerator(
-  name = "OctopusParser",
+  name = "OrcaParser",
   parserInfo = jn.JObject(
-    ("name" -> jn.JString("OctopusParser")) ::
-      ("parserId" -> jn.JString("OctopusParser" + lab.OctopusVersionInfo.version)) ::
+    ("name" -> jn.JString("OrcaParser")) ::
+      ("parserId" -> jn.JString("OrcaParser" + lab.OctopusVersionInfo.version)) ::
       ("versionInfo" -> jn.JObject(
         ("nomadCoreVersion" -> jn.JObject(lab.NomadCoreVersionInfo.toMap.map {
           case (k, v) => k -> jn.JString(v.toString)
@@ -24,10 +24,10 @@ object OctopusParser extends SimpleExternalParserGenerator(
   //TODO: Update the replacement string (mainFileRe)
   mainFileRe = """******************************** Grid ********************************
                  |Simulation Box:""".r,
-  cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/octopus/parser/parser-octopus/OctopusParser.py",
+  cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/octopus/parser/parser-octopus/OrcaParser.py",
     "--uri", "${mainFileUri}", "${mainFilePath}"),
   resList = Seq(
-    "parser-octopus/OctopusParser.py",
+    "parser-octopus/OrcaParser.py",
     "parser-octopus/setup_paths.py",
     "nomad_meta_info/public.nomadmetainfo.json",
     "nomad_meta_info/common.nomadmetainfo.json",
diff --git a/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
index 27a7316bb81c0707f8682219c17706746a76ff65..c4866c4d0e53e0973599544ceb3db0e0f289e73a 100644
--- a/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
@@ -3,12 +3,12 @@ package eu.nomad_lab.parsers
 import org.specs2.mutable.Specification
 
 object OctopusParserSpec extends Specification {
-  "CastepParserTest" >> {
+  "OctopusParserTest" >> {
     "test with json-events" >> {
-      ParserRun.parse(CastepParser, "parsers/castep/test/examples/", "json-events") must_== ParseResult.ParseSuccess
+      ParserRun.parse(OctopusParser, "parsers/octopus/test/examples/", "json-events") must_== ParseResult.ParseSuccess
     }
     "test with json" >> {
-      ParserRun.parse(CastepParser, "parsers/castep/test/examples/", "json") must_== ParseResult.ParseSuccess
+      ParserRun.parse(OctopusParser, "parsers/octopus/test/examples/", "json") must_== ParseResult.ParseSuccess
     }
   }
 }