diff --git a/km3buu/jobcard.py b/km3buu/jobcard.py
index 6cb7e0ff48ee7fea8bf4ae41752b033c6ce53333..2077aafb5083a750af88b453f84fba843b0338d9 100644
--- a/km3buu/jobcard.py
+++ b/km3buu/jobcard.py
@@ -147,8 +147,8 @@ def generate_neutrino_jobcard(events,
     jc["neutrino_induced"]["process_ID"] = PROCESS_LOOKUP[process.lower()]
     jc["neutrino_induced"]["flavor_ID"] = FLAVOR_LOOKUP[flavour.lower()]
     # TARGET
-    jc["target"]["target_Z"] = target[1]
-    jc["target"]["target_A"] = target[0]
+    jc["target"]["z"] = target[1]
+    jc["target"]["a"] = target[0]
     # EVENTS
     run_events = int(100000 / target[1])
     if events < run_events:
diff --git a/km3buu/output.py b/km3buu/output.py
index 152d8965ee46f621a9636ecf8e18e03bf484fa7e..9e34538acd7e831fbe24d28979c7155b0f15172a 100644
--- a/km3buu/output.py
+++ b/km3buu/output.py
@@ -536,11 +536,19 @@ class GiBUUOutput:
 
     @property
     def A(self):
-        return self.jobcard["target"]["target_a"]
+        grp = self.jobcard["target"]
+        if "a" in grp.keys():
+            return grp["a"]
+        elif "target_a" in grp.keys():
+            return grp["target_a"]
 
     @property
     def Z(self):
-        return self.jobcard["target"]["target_z"]
+        grp = self.jobcard["target"]
+        if "z" in grp.keys():
+            return grp["z"]
+        elif "target_z" in grp.keys():
+            return grp["target_z"]
 
     @property
     def data_path(self):
diff --git a/km3buu/tests/test_ctrl.py b/km3buu/tests/test_ctrl.py
index 6ed8493e8654bf12995f61719ce8f5a0395d7248..d12ef4717d0eabe3e6f0cc046433398aae8a951c 100644
--- a/km3buu/tests/test_ctrl.py
+++ b/km3buu/tests/test_ctrl.py
@@ -78,8 +78,8 @@ class TestCTRLbyJobcardObject(unittest.TestCase):
         self.test_jobcard["input"]["num_runs_SameEnergy"] = 1
         self.test_jobcard["input"]["LRF_equals_CALC_frame"] = True
         # TARGET
-        self.test_jobcard["target"]["target_Z"] = 1
-        self.test_jobcard["target"]["target_A"] = 1
+        self.test_jobcard["target"]["z"] = 1
+        self.test_jobcard["target"]["a"] = 1
         # MISC
         # self.test_jobcard["nl_neutrinoxsection"]["DISmassless"] =  True
         self.test_jobcard["neutrinoAnalysis"]["outputEvents"] = True
diff --git a/km3buu/tests/test_jobcard.py b/km3buu/tests/test_jobcard.py
index 2885a63deba8a3006c7e8e4bca882b4359f9b564..da620757c259943f623772dc5de84607c28fd310 100644
--- a/km3buu/tests/test_jobcard.py
+++ b/km3buu/tests/test_jobcard.py
@@ -79,8 +79,8 @@ class TestNeutrinoEnergyRangeJobcard(unittest.TestCase):
         self.assertEqual("/test", self.test_jobcard["input"]["path_to_input"])
 
     def test_target(self):
-        self.assertEqual(self.test_Z, self.test_jobcard["target"]["target_Z"])
-        self.assertEqual(self.test_A, self.test_jobcard["target"]["target_A"])
+        self.assertEqual(self.test_Z, self.test_jobcard["target"]["Z"])
+        self.assertEqual(self.test_A, self.test_jobcard["target"]["A"])
 
     def test_energy(self):
         self.assertAlmostEqual(
@@ -129,8 +129,8 @@ class TestNeutrinoSingleEnergyJobcard(unittest.TestCase):
         self.assertEqual("/test", self.test_jobcard["input"]["path_to_input"])
 
     def test_target(self):
-        self.assertEqual(self.test_Z, self.test_jobcard["target"]["target_Z"])
-        self.assertEqual(self.test_A, self.test_jobcard["target"]["target_A"])
+        self.assertEqual(self.test_Z, self.test_jobcard["target"]["z"])
+        self.assertEqual(self.test_A, self.test_jobcard["target"]["a"])
 
     def test_energy(self):
         self.assertAlmostEqual(self.test_energy,