diff --git a/modules/hosting/clone/hosting_clone.drush.inc b/modules/hosting/clone/hosting_clone.drush.inc
index 1e40a1b..2d70cff 100644
--- a/modules/hosting/clone/hosting_clone.drush.inc
+++ b/modules/hosting/clone/hosting_clone.drush.inc
@@ -51,8 +51,8 @@ function hosting_clone_post_hosting_clone_task($task, $data) {
 
 
     $profile = hosting_package_instance_load(array(
-      'rid' => $target,
-      'short_name' => $data['context']['profile']
+      'i.rid' => $target,
+      'p.short_name' => $data['context']['profile']
     ));
     if ($profile) {
       $clone->profile = $profile->package_id;
diff --git a/modules/hosting/migrate/hosting_migrate.drush.inc b/modules/hosting/migrate/hosting_migrate.drush.inc
index 1d79ba7..5fc91e7 100644
--- a/modules/hosting/migrate/hosting_migrate.drush.inc
+++ b/modules/hosting/migrate/hosting_migrate.drush.inc
@@ -65,8 +65,8 @@ function hosting_migrate_post_hosting_migrate_task($task, $data) {
     }
 
     $profile = hosting_package_instance_load(array(
-      'rid' => $target,
-      'short_name' => $data['context']['profile']
+      'i.rid' => $target,
+      'p.short_name' => $data['context']['profile']
     ));
     if ($profile) {
       $site->profile = $profile->package_id;
diff --git a/modules/hosting/package/hosting_package.instance.inc b/modules/hosting/package/hosting_package.instance.inc
index 7229202..3289bd8 100644
--- a/modules/hosting/package/hosting_package.instance.inc
+++ b/modules/hosting/package/hosting_package.instance.inc
@@ -32,8 +32,8 @@ function hosting_package_instance_sync($rid) {
 
     foreach ($merged as $name => $package) {
       $instance = hosting_package_instance_load(array(
-        'rid' => $rid,
-        'package_id' => $package['package_id']));
+        'i.rid' => $rid,
+        'i.package_id' => $package['package_id']));
       if (!$instance) {
         $instance = new stdClass();
         $instance->rid = $rid;
diff --git a/modules/hosting/package/hosting_package.module b/modules/hosting/package/hosting_package.module
index 5f9c485..43bb9d6 100644
--- a/modules/hosting/package/hosting_package.module
+++ b/modules/hosting/package/hosting_package.module
@@ -164,7 +164,7 @@ function hosting_get_profile_languages($profile = NULL, $platform = NULL) {
   $languages['en'] = _hosting_language_name('en');
   if ($profile && $platform) {
     $instance = hosting_package_instance_load(array(
-      'rid' => $platform, 'package_id' => $profile));
+      'i.rid' => $platform, 'i.package_id' => $profile));
     $languages = array_merge($languages, $instance->languages);
   }
   else {
diff --git a/modules/hosting/platform/hosting_platform.drush.inc b/modules/hosting/platform/hosting_platform.drush.inc
index 5e7fb98..8ebf54c 100644
--- a/modules/hosting/platform/hosting_platform.drush.inc
+++ b/modules/hosting/platform/hosting_platform.drush.inc
@@ -42,7 +42,7 @@ function hosting_platform_post_hosting_verify_task($task, $data) {
     foreach ($context['profiles'] as $profile) {
       hosting_package_sync($packages['profiles'][$profile]);
       $instance = hosting_package_instance_load(
-        array('short_name' => $profile, 'rid' => $node->nid, 'package_type' => 'profile'));
+        array('p.short_name' => $profile, 'i.rid' => $node->nid, 'p.package_type' => 'profile'));
       hosting_package_instance_sync($instance->iid, $packages['base'], $packages['profiles'][$profile]);
 
       // @todo : package instances of modules to profiles.
diff --git a/modules/hosting/site/hosting_site.module b/modules/hosting/site/hosting_site.module
index d7cd8a8..dbd05ec 100644
--- a/modules/hosting/site/hosting_site.module
+++ b/modules/hosting/site/hosting_site.module
@@ -332,13 +332,13 @@ function hosting_import_site($site_id, $data, $platform) {
 
 
   $profile = hosting_package_instance_load(array(
-    'rid' => $platform,
-    'short_name' => $data['profile']
+    'i.rid' => $platform,
+    'p.short_name' => $data['profile']
   ));
   if (!$profile) {
     $profile = hosting_package_instance_load(array(
-       'rid' => $platform,
-       'short_name' => 'default'));
+       'i.rid' => $platform,
+       'p.short_name' => 'default'));
   }
   $site->profile = $profile->package_id;