diff --git a/src/main/java/org/kiwitcms/java/api/RpcClient.java b/src/main/java/org/kiwitcms/java/api/RpcClient.java
index 995be04..9eee90e 100644
--- a/src/main/java/org/kiwitcms/java/api/RpcClient.java
+++ b/src/main/java/org/kiwitcms/java/api/RpcClient.java
@@ -322,10 +322,10 @@ public Build[] getBuilds(Map<String, Object> filter) {
         }
     }
 
-    public Build createBuild(String name, int productId) {
+    public Build createBuild(String name, int versionId) {
         Map<String, Object> params = new HashMap<>();
         params.put("name", name);
-        params.put("product", productId);
+        params.put("version", versionId);
         JSONObject json = (JSONObject) executeViaPositionalParams(CREATE_BUILD_METHOD, Arrays.asList((Object) params));
         try {
             return new ObjectMapper().readValue(json.toJSONString(), Build.class);
diff --git a/src/main/java/org/kiwitcms/java/junit/TestDataEmitter.java b/src/main/java/org/kiwitcms/java/junit/TestDataEmitter.java
index 3133ebc..83adbc9 100644
--- a/src/main/java/org/kiwitcms/java/junit/TestDataEmitter.java
+++ b/src/main/java/org/kiwitcms/java/junit/TestDataEmitter.java
@@ -79,7 +79,7 @@ public int getTestRunId() {
 //TODO: this must check if this TR is already available in the DB
 // and not create a new TR for the same product, version and build
             if (runId == null) {
-                runId = client.createNewRun(getBuild(getProductId()),
+                runId = client.createNewRun(getBuild(getVersion(getProductId())),
                         config.getUsername(),
                         getPlanId(),
                         String.format("[JUnit] Results for %s, %s, %s",
@@ -109,17 +109,17 @@ public void addTestResultsToRun(int runId, List<TestMethod> tests) {
         }
     }
 
-    public int getBuild(int productId) {
+    public int getBuild(int versionId) {
         String confBuild = config.getBuild();
         Map<String, Object> filter = new HashMap<>();
-        filter.put("product", productId);
+        filter.put("version", versionId);
         if (confBuild != null) {
             filter.put("name", confBuild);
             Build[] existingBuilds = client.getBuilds(filter);
             if (existingBuilds.length > 0) {
                 return existingBuilds[0].getId();
             } else {
-                Build newBuild = client.createBuild(confBuild, productId);
+                Build newBuild = client.createBuild(confBuild, versionId);
                 if (newBuild != null) {
                     return newBuild.getId();
                 }