diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
index 1060eadff67ce7ea6f1cc68a145a6527131fc7b8..b526ba6cd430e420f846d72d986cca6cc13b09f0 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
@@ -37,8 +37,8 @@ public abstract class Problem {
         this.location = Objects.requireNonNull(location);
     }
 
-    public RPackage getPkg() {
-        return pkgTestRun.getPkg();
+    public RPackage getPackage() {
+        return pkgTestRun.getPackage();
     }
 
     public RPackageTestRun getPackageTestRun() {
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
index cb2eccc583c49a782fb8ad5656e5a52a577c6451..72526ca7183a89c95cc8a32dceea96bb40073a66 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
@@ -36,7 +36,7 @@ public class RPackageTestRun {
         this.nr = nr;
     }
 
-    public RPackage getPkg() {
+    public RPackage getPackage() {
         return pkg;
     }
 
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
index b6a1b4d8bfa3ee0fe22334e52a9297accd5bdb47..9bb80f4be814b0b9d374e0ff4d49566050ad9e1a 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
@@ -71,13 +71,13 @@ public class InstallationProblemDetector extends LineDetector {
 
         @Override
         public String toString() {
-            return String.format("%s: Installation failed in '%s'; message: %s", getLocation(), getPkg().getName(),
+            return String.format("%s: Installation failed in '%s'; message: %s", getLocation(), getPackage().getName(),
                             message);
         }
 
         @Override
         public String getSummary() {
-            return String.format("Installation failed in pacakge '%s'", getPkg().getName());
+            return String.format("Installation failed in package '%s'", getPackage().getName());
         }
 
         @Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
index 58e533f0fca22ce08f270063b2be9f4858e26819..097e746ce8884dd77503d805087141dd37797d11 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
@@ -88,7 +88,7 @@ public class RErrorDetector extends LineDetector {
 
         @Override
         public String toString() {
-            return String.format("%s: RError in '%s' (msg = '%s'), args)", getLocation(), getPkg().getName(), message);
+            return String.format("%s: RError in '%s' (msg = '%s'), args)", getLocation(), getPackage().getName(), message);
         }
 
         @Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
index 06e2962024cb1f2ecc2e0f4cc5c6b685b369ebf3..4212ec4b8ca7c1abe23c38614bb3bca08582a821 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
@@ -79,12 +79,12 @@ public class SegfaultDetector extends LineDetector {
 
         @Override
         public String toString() {
-            return getLocation() + ": SIGSEGV in " + getPkg();
+            return getLocation() + ": SIGSEGV in " + getPackage();
         }
 
         @Override
         public String getSummary() {
-            return ": SIGSEGV in " + getPkg();
+            return ": SIGSEGV in " + getPackage();
         }
 
         @Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
index 51ad0631f45ecb203962257f100e971f59a1786e..76cae7fb6eae58bb6f60218259b03d5e650470ce 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
@@ -39,7 +39,7 @@ public abstract class AbstractDumper {
     }
 
     protected Map<RPackage, List<Problem>> groupByPkg(Collection<Problem> problems) {
-        return problems.stream().collect(Collectors.groupingBy(p -> p.getPackageTestRun().getPkg()));
+        return problems.stream().collect(Collectors.groupingBy(p -> p.getPackageTestRun().getPackage()));
     }
 
 }
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
index 234d7dd6494a22e1a9da0762c10225239f2b6058..e3d6a9713002cf363e50e0181315e54e3dbfca69 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
@@ -277,7 +277,7 @@ public class LogFileParser {
     }
 
     private String getPkgName() {
-        return pkg.getPkg().getName();
+        return pkg.getPackage().getName();
     }
 
     private static boolean parseStatus(String substring) {