diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 21be7471..fa69033e 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -4938,7 +4938,11 @@ public function getPDFormDetailsJSON_post()
 		
 		$bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id'];
 		$main_applicant_name = $pd_master_details[0]['main_applicant'];
-		$key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf';
+		$pdf_name = 'PD_REPORTS_'.$main_applicant_name;
+		
+		// $key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf';
+		$type1_key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf';
+		$type2_key = 'pd'.$pdid.'/pd_reports/'.$pdf_name.'.pdf';
 		
 		
 		
@@ -4995,7 +4999,7 @@ public function getPDFormDetailsJSON_post()
 			{
 
 				$sourcefile = $output_file2;
-				$bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile);
+				$bucket_data = array('bucket_name'=>$bucketname,'key'=>$type2_key,'sourcefile'=>$sourcefile);
 				$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
 					//print_r($s3result);
 				if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
@@ -5009,7 +5013,15 @@ public function getPDFormDetailsJSON_post()
 
 
 
-					$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
+					//	$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
+					    $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');	
+						$headers = @get_headers($_uri);
+						if($headers && strpos( $headers[0], '200')) {
+							$singed_uri = $_uri;
+						}else {
+							$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
+						}
+
 
 					if($id != null || $id != "" )
 					{
@@ -5039,7 +5051,14 @@ public function getPDFormDetailsJSON_post()
 		else //If Qc not edited pull PDF uri from S3
 		{
 			
-			$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
+			// $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
+			   $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'+30 minutes');	
+			   $headers = @get_headers($_uri);
+			    if($headers && strpos( $headers[0], '200')) {
+					$singed_uri = $_uri;
+				}else {
+					$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'+30 minutes');
+				}
 
 			if($singed_uri != null || $singed_uri != "" )
 			{
diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 4ebbd444..29f5aa30 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -1644,22 +1644,31 @@ public function filterSalesPDList_post() {
 		}
 		
 		// echo $html_content;exit();
-		$pdf_name = $view_data['pd_master_details'][0]['main_applicant'];
+		$type1_pdf_name = $view_data['pd_master_details'][0]['main_applicant'];
+		$type2_pdf_name = "PD_Report_".$view_data['pd_master_details'][0]['main_applicant'];
 		$pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait");
 				//End of PDF Gen using DOM PDF
 				$output_file = $this->external_path ."/pd_reports/" . $records['pd_id'] . "/temp.pdf";
 				$bytes = file_put_contents($output_file, $pdf_doc);
 				  //echo $bytes;die();
 				$bucket_name = LENDER_BUCKET_NAME_PREFIX.(ENVIRONMENT == 'production'  ? 7 : 35);
-				$key = 'pd'.$records['pd_id'].'/pd_reports/'.$pdf_name.'.pdf';
-				$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$key,'sourcefile'=>$output_file);
+				$type1_key = 'pd'.$records['pd_id'].'/pd_reports/'.$type1_pdf_name.'.pdf';
+				$type2_key = 'pd'.$records['pd_id'].'/pd_reports/'.$type2_pdf_name.'.pdf';
+				$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type2_key,'sourcefile'=>$output_file);
 				$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
 				if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
 				 {
 				 	
 				 	// $this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
 				 	
-					 	$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes');
+					 	// $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes');
+						 $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');	
+						$headers = @get_headers($_uri);
+						if($headers && strpos( $headers[0], '200')) {
+							$singed_uri = $_uri;
+						}else {
+							$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
+						}
 					    $data['dataStatus'] = true;
 						$data['status'] = REST_Controller::HTTP_OK;
 						$data['records'] = $singed_uri;
diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index 810ac1cf..36e65fe3 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -190,16 +190,10 @@ class Sales_PD_Controller extends REST_Controller {
 			$type2_pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr'];
 			$type2_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); 
 
-			// 3rd Type Key name. (string,name,type,abbr and date).
-			$type2_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name']));
-			$type2_pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr'];
-			$type2_pdf_name .= 'PD_Report-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); 
-			
 			//$this->Sales_PD_Model->updateRecords(array('pd_report_filename' => 'PD_Report-'.$pdf_name),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
 
 			$type1_key = 'sales_pd/'.$sales_pd_id.'/'.$type1_pdf_name.'.pdf';
 			$type2_key = 'sales_pd/'.$sales_pd_id.'/'.$type2_pdf_name.'.pdf';
-			$type3_key = 'sales_pd/'.$sales_pd_id.'/'.$type3_pdf_name.'.pdf';
 			
 			if(!file_exists($this->external_path.'/sales_pd/'.$sales_pd_id))
 			{
@@ -233,7 +227,7 @@ class Sales_PD_Controller extends REST_Controller {
 				$bytes = file_put_contents($output_file, $pdf_doc);
 				 //echo $bytes;
 				 //die();
-				$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type3_key,'sourcefile'=>$this->external_path.'/sales_pd/'.$sales_pd_id.'/temp.pdf');
+				$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type2_key,'sourcefile'=>$this->external_path.'/sales_pd/'.$sales_pd_id.'/temp.pdf');
 				log_message('ERROR','####SALES PD REPORT UPLOAD TO S3'.$sales_pd_id);
 		 	    $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
 
@@ -243,16 +237,12 @@ class Sales_PD_Controller extends REST_Controller {
 				 	$this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
 				 	if($api)
 				 	{   
-						$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type3_key,'30 minutes');	
+						$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');	
 						$headers = @get_headers($_uri);
 						if($headers && strpos( $headers[0], '200')) {
 							$singed_uri = $_uri;
 						}else {
-							if($headers && strpos( $headers[0], '200')) {
-								$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
-							}else {
-								$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
-							}
+							$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
 						}
 					    $data['dataStatus'] = true;
 						$data['status'] = REST_Controller::HTTP_OK;
@@ -266,16 +256,12 @@ class Sales_PD_Controller extends REST_Controller {
 				if($api)
 				 {
 					 	## NEW KEY BECAUSE TITLE-RENAME 
-						$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type3_key,'30 minutes');	
+						$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');	
 						$headers = @get_headers($_uri);
 						if($headers && strpos( $headers[0], '200')) {
 							$singed_uri = $_uri;
 						}else {
-							if($headers && strpos( $headers[0], '200')) {
-								$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
-							}else {
-								$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type3_key,'30 minutes');
-							}
+								$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
 						}
 				    $data['dataStatus'] = true;
 					$data['status'] = REST_Controller::HTTP_OK;