diff --git a/savannaclient/api/data_sources.py b/savannaclient/api/data_sources.py
index 74f3d287..d2a35c32 100644
--- a/savannaclient/api/data_sources.py
+++ b/savannaclient/api/data_sources.py
@@ -42,4 +42,4 @@ class DataSourceManager(base.ResourceManager):
             'credentials': credentials
         }
 
-        return self._create('/data-sources', data, 'resource')
+        return self._create('/data-sources', data, 'data_source')
diff --git a/savannaclient/api/job_binaries.py b/savannaclient/api/job_binaries.py
index 38d548be..ca448614 100644
--- a/savannaclient/api/job_binaries.py
+++ b/savannaclient/api/job_binaries.py
@@ -37,4 +37,4 @@ class JobBinariesManager(base.ResourceManager):
 
         self._copy_if_defined(data, description=description)
 
-        return self._create("/job-binaries", data, "resource")
+        return self._create("/job-binaries", data, "job_binary")
diff --git a/savannaclient/api/job_binary_internals.py b/savannaclient/api/job_binary_internals.py
index b2e97549..1ac31779 100644
--- a/savannaclient/api/job_binary_internals.py
+++ b/savannaclient/api/job_binary_internals.py
@@ -36,5 +36,5 @@ class JobBinaryInternalsManager(base.ResourceManager):
         if resp.status_code != 202:
             self._raise_api_exception(resp)
 
-        data = resp.json()["resource"]
+        data = resp.json()["job_binary_internal"]
         return self.resource_class(self, data)
diff --git a/savannaclient/api/job_origins.py b/savannaclient/api/job_origins.py
index 10363583..2c3d5463 100644
--- a/savannaclient/api/job_origins.py
+++ b/savannaclient/api/job_origins.py
@@ -40,4 +40,4 @@ class JobOriginsManager(base.ResourceManager):
             'libs': libs,
         }
 
-        return self._create('/job-origins', data, "resource")
+        return self._create('/job-origins', data, "job_origin")
diff --git a/savannaclient/api/jobs.py b/savannaclient/api/jobs.py
index 483aa669..b5e63d0e 100644
--- a/savannaclient/api/jobs.py
+++ b/savannaclient/api/jobs.py
@@ -43,4 +43,4 @@ class JobsManager(base.ResourceManager):
             'output_type': output_type
         }
 
-        return self._create('/jobs', data, 'resource')
+        return self._create('/jobs', data, 'job')