diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs
index 94f1697c..00dc7331 100644
--- a/src/ArtifactoryUploader/PackageUploadHelper.cs
+++ b/src/ArtifactoryUploader/PackageUploadHelper.cs
@@ -1172,8 +1172,8 @@ public static async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
diff --git a/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs b/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs
index b3ee0ed7..08e31a19 100644
--- a/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs
+++ b/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs
@@ -27,13 +27,13 @@ public interface IJfrogAqlApiCommunication
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the internal component data based on repo name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName);
        
 
         /// <summary>
diff --git a/src/LCT.APICommunications/JfrogAqlApiCommunication.cs b/src/LCT.APICommunications/JfrogAqlApiCommunication.cs
index 38deb8c5..854f94f9 100644
--- a/src/LCT.APICommunications/JfrogAqlApiCommunication.cs
+++ b/src/LCT.APICommunications/JfrogAqlApiCommunication.cs
@@ -66,7 +66,7 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep
             HttpContent httpContent = new StringContent(aqlQueryToBody);
             return await httpClient.PostAsync(uri, httpContent);
         }
-        public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)
         {
             HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);
             TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);
@@ -82,7 +82,7 @@ public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string
             HttpContent httpContent = new StringContent(aqlQueryToBody);
             return await httpClient.PostAsync(uri, httpContent);
         }
-        public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)
         {
             HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);
             TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);
diff --git a/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs b/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs
index ed585956..f7f3b314 100644
--- a/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs
+++ b/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs
@@ -26,13 +26,13 @@ public interface IJfrogAqlApiCommunicationFacade
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the Internal Component Data By Repo Name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName);
         
 
         /// <summary>
diff --git a/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs b/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs
index f9a4cb43..f4724108 100644
--- a/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs
+++ b/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs
@@ -51,18 +51,18 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)
         {
-            return await m_jfrogAqlApiCommunication.GetNpmInternalComponentDataByRepo(repoName);
+            return await m_jfrogAqlApiCommunication.GetNpmComponentDataByRepo(repoName);
         }
         /// <summary>
         /// Gets the Internal Component Data By Repo Name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)
         {
-            return await m_jfrogAqlApiCommunication.GetPypiInternalComponentDataByRepo(repoName);
+            return await m_jfrogAqlApiCommunication.GetPypiComponentDataByRepo(repoName);
         }
        
         /// <summary>
diff --git a/src/LCT.PackageIdentifier/BomHelper.cs b/src/LCT.PackageIdentifier/BomHelper.cs
index bb98622f..cb30267b 100644
--- a/src/LCT.PackageIdentifier/BomHelper.cs
+++ b/src/LCT.PackageIdentifier/BomHelper.cs
@@ -183,8 +183,8 @@ public async Task<List<AqlResult>> GetNpmListOfComponentsFromRepo(string[] repoL
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetNpmInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetNpmComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
@@ -197,8 +197,8 @@ public async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string[] repo
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
diff --git a/src/LCT.Services/Interface/IJFrogService.cs b/src/LCT.Services/Interface/IJFrogService.cs
index 05a964c8..a88c7e54 100644
--- a/src/LCT.Services/Interface/IJFrogService.cs
+++ b/src/LCT.Services/Interface/IJFrogService.cs
@@ -28,13 +28,13 @@ public interface IJFrogService
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>IList<AqlResult></returns>
-        public Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string repoName);
+        public Task<IList<AqlResult>> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the internal component data by Repo name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>IList<AqlResult></returns>
-        public Task<IList<AqlResult>> GetPypiInternalComponentDataByRepo(string repoName);
+        public Task<IList<AqlResult>> GetPypiComponentDataByRepo(string repoName);
        
         /// <summary>
         /// Gets the package information in the repo, via the name or path
diff --git a/src/LCT.Services/JFrogService.cs b/src/LCT.Services/JFrogService.cs
index 8202c0b7..f85dd8c5 100644
--- a/src/LCT.Services/JFrogService.cs
+++ b/src/LCT.Services/JFrogService.cs
@@ -64,14 +64,14 @@ public async Task<IList<AqlResult>> GetInternalComponentDataByRepo(string repoNa
 
             return aqlResult;
         }
-        public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<IList<AqlResult>> GetNpmComponentDataByRepo(string repoName)
         {
             HttpResponseMessage httpResponseMessage = null;
             IList<AqlResult> aqlResult = new List<AqlResult>();
 
             try
             {
-                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmInternalComponentDataByRepo(repoName);
+                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmComponentDataByRepo(repoName);
                 if (httpResponseMessage == null || !httpResponseMessage.IsSuccessStatusCode)
                 {
                     return new List<AqlResult>();
@@ -96,14 +96,14 @@ public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string rep
 
             return aqlResult;
         }
-        public async Task<IList<AqlResult>> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<IList<AqlResult>> GetPypiComponentDataByRepo(string repoName)
         {
             HttpResponseMessage httpResponseMessage = null;
             IList<AqlResult> aqlResult = new List<AqlResult>();
 
             try
             {
-                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiInternalComponentDataByRepo(repoName);
+                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiComponentDataByRepo(repoName);
                 if (httpResponseMessage == null || !httpResponseMessage.IsSuccessStatusCode)
                 {
                     return new List<AqlResult>();