diff --git a/project_dependency.drupal.inc b/project_dependency.drupal.inc
index 7e51cab..f2b761e 100644
--- a/project_dependency.drupal.inc
+++ b/project_dependency.drupal.inc
@@ -93,10 +93,12 @@ function project_dependency_info_parse(array $info_files, $tag) {
 function project_dependency_select_release($parsed_component, $api_tid) {
   if (isset($parsed_component['project'])) {
     // Looks for release with project name match.
-    $component = $parsed_component['project'];
+    $project = $parsed_component['project'];
+    $component = $parsed_component['name'];
   }
   else {
     // Looks for release with project name the same as the module name.
+    $project = $parsed_component['name'];
     $component = $parsed_component['name'];
   }
   $sql = 'SELECT DISTINCT release_nid FROM {project_dependency_component} pdc
@@ -105,8 +107,9 @@ function project_dependency_select_release($parsed_component, $api_tid) {
     LEFT JOIN {field_data_field_project_machine_name} AS project
       ON pr.field_release_project_target_id=project.entity_id
     WHERE pdc.name = :cname
-      AND project.field_project_machine_name_value = :cname';
-  $project_release_nids = db_query($sql, array(':cname' => $component))
+      AND project.field_project_machine_name_value = :pname';
+  $params = array(':cname' => $component, ':pname' => $project);
+  $project_release_nids = db_query($sql, $params)
     ->fetchCol();
   if (!empty($project_release_nids)) {
     $release = project_dependency_get_release($project_release_nids,
@@ -565,13 +568,14 @@ function project_dependency_get_external_component_dependencies($release_node,
       if (!isset($parsed_dependency['project'])) {
         $project = project_dependency_guess_project($parsed_dependency,
           $api_term->tid);
-       if ($project) {
-         $project_name = project_dependency_field_value($project, 'field_project_machine_name');
-         $external_dependencies[$key]->dependency = $project_name . ':' .
-           $dependency->dependency;
-       }
-       else {
-         watchdog('project_dependency', 'Failed to find a release for component %component as dependency of %depending_component, release_nid=%release_nid', array('%component' => $parsed_dependency['name'], '%depending_component' => $dependency->depender, '%release_nid' => $release_node->nid));
+        
+        if ($project) {
+          $project_name = project_dependency_field_value($project, 'field_project_machine_name');
+          $external_dependencies[$key]->dependency = $project_name . ':' .
+            $dependency->dependency;
+        }
+        else {
+          watchdog('project_dependency', 'Failed to find a release for component %component as dependency of %depending_component, release_nid=%release_nid', array('%component' => $parsed_dependency['name'], '%depending_component' => $dependency->depender, '%release_nid' => $release_node->nid));
         }
 
       }