diff --git a/services_entity.resources.inc b/services_entity.resources.inc
index 8c559fe..d8bd3c1 100644
--- a/services_entity.resources.inc
+++ b/services_entity.resources.inc
@@ -6,7 +6,7 @@ function _services_entity_resource_access($op, $args) {
   return $resource->access($op, $args);
 }
 
-function _services_entity_resource_create($entity_type, $values) {
+function _services_entity_resource_create($entity_type, $entity) {
   $resourceclass = variable_get('services_entity_resource_class', 'ServicesEntityResourceController');
   $resource = new $resourceclass;
   return $resource->create($entity_type, $values);
@@ -18,7 +18,7 @@ function _services_entity_resource_retrieve($entity_type, $entity_key, $fields)
   return $resource->retrieve($entity_type, $entity_key, $fields);
 }
 
-function _services_entity_resource_update($entity_type, $entity_id, $values) {
+function _services_entity_resource_update($entity_type, $entity_id, $entity) {
   $resourceclass = variable_get('services_entity_resource_class', 'ServicesEntityResourceController');
   $resource = new $resourceclass;
   return $resource->update($entity_type, $entity_id, $values);
diff --git a/services_entity.services.inc b/services_entity.services.inc
index 6980645..0fa6c84 100644
--- a/services_entity.services.inc
+++ b/services_entity.services.inc
@@ -21,11 +21,11 @@ function services_entity_services_resources() {
             'description' => 'The type of the entity to create',
           ),
           array(
-            'name' => 'values',
+            'name' => $entity_type,
             'optional' => FALSE,
             'source' => 'data',
             'description' => 'The values used to create the entity',
-            'type' => 'struct',
+            'type' => 'array',
           ),
         ),
         'access callback' => '_services_entity_resource_access',
@@ -88,11 +88,11 @@ function services_entity_services_resources() {
           'description' => 'The ID of the ' . $entity_type . ' to update.',
           ),
           array(
-            'name' => 'values',
+            'name' => $entity_type,
             'optional' => FALSE,
             'source' => 'data',
             'description' => 'The entity data to update',
-            'type' => 'struct',
+            'type' => 'array',
           ),
         ),
         'access callback' => '_services_entity_resource_access',