1 files changed, 12 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
index 3f9a83ba937..abac3237b72 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
@@ -29,8 +29,8 @@ public class CreateBranchData implements Identifiable {
    private ReadableArtifact userArtifact;
 
    // Merge Branch Legacy Support
-   private int populateBaseTxFromAddressingQueryId;
-   private int destinationBranchId;
+   private int mergeAddressingQueryId;
+   private int mergeDestinationBranchId;
 
    @Override
    public String getGuid() {
@@ -90,22 +90,23 @@ public class CreateBranchData implements Identifiable {
       this.associatedArtifact = associatedArtifact;
    }
 
-   public int getPopulateBaseTxFromAddressingQueryId() {
-      return populateBaseTxFromAddressingQueryId;
+   public int getMergeAddressingQueryId() {
+      return mergeAddressingQueryId;
    }
 
-   public void setPopulateBaseTxFromAddressingQueryId(int populateBaseTxFromAddressingQueryId) {
-      this.populateBaseTxFromAddressingQueryId = populateBaseTxFromAddressingQueryId;
+   public void setMergeAddressingQueryId(int mergeAddressingQueryId) {
+      this.mergeAddressingQueryId = mergeAddressingQueryId;
    }
 
-   public int getDestinationBranchId() {
-      return destinationBranchId;
+   public int getMergeDestinationBranchId() {
+      return mergeDestinationBranchId;
    }
 
-   public void setDestinationBranchId(int destinationBranchId) {
-      this.destinationBranchId = destinationBranchId;
+   public void setMergeDestinationBranchId(int destinationBranchId) {
+      this.mergeDestinationBranchId = destinationBranchId;
    }
 
+
    @Override
    public int hashCode() {
       return getGuid().hashCode();
@@ -131,7 +132,7 @@ public class CreateBranchData implements Identifiable {
 
    @Override
    public String toString() {
-      return "CreateBranchData [branchUuid=" + branchUuid + ", branchName=" + branchName + ", branchType=" + branchType + ", creationComment=" + creationComment + ", fromTransaction=" + fromTransaction + ", associatedArtifact=" + associatedArtifact + ", userArtifact=" + userArtifact + ", populateBaseTxFromAddressingQueryId=" + populateBaseTxFromAddressingQueryId + ", destinationBranchId=" + destinationBranchId + "]";
+      return "CreateBranchData [branchUuid=" + branchUuid + ", branchName=" + branchName + ", branchType=" + branchType + ", creationComment=" + creationComment + ", fromTransaction=" + fromTransaction + ", associatedArtifact=" + associatedArtifact + ", userArtifact=" + userArtifact + ", mergeAddressingQueryId=" + mergeAddressingQueryId + ", destinationBranchId=" + mergeDestinationBranchId + "]";
    }
 
 }