diff --git a/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java b/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
index bea777d515c2554cae4c922221e9bd3c8910a5d8..e70f830625227182bdd2af7faadd6dc385bbc79e 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
@@ -16,7 +16,7 @@ public abstract class InterestGroupData {
     public abstract String getTitle();
     public abstract String getLogo();
     public abstract String getState();
-    public abstract String getFoundationdbProjectId();
+    public abstract String getProjectId();
     public abstract Descriptor getDescription();
     public abstract Descriptor getScope();
     public abstract List<User> getLeads();
@@ -29,13 +29,13 @@ public abstract class InterestGroupData {
 
     @AutoValue.Builder
     @JsonPOJOBuilder(withPrefix = "set")
-    public static abstract class Builder {
+    public abstract static class Builder {
         public abstract Builder setId(String id);
         public abstract Builder setTitle(String title);
         public abstract Builder setGitlab(GitlabProject gitlab);
         public abstract Builder setLogo(String logo);
         public abstract Builder setState(String state);
-        public abstract Builder setFoundationdbProjectId(String foundationdbProjectId);
+        public abstract Builder setProjectId(String foundationdbProjectId);
         public abstract Builder setDescription(Descriptor description);
         public abstract Builder setScope(Descriptor scope);
         public abstract Builder setLeads(List<User> leads);
@@ -45,7 +45,7 @@ public abstract class InterestGroupData {
 
     @AutoValue
     @JsonDeserialize(builder = AutoValue_InterestGroupData_Descriptor.Builder.class)
-    public static abstract class Descriptor {
+    public abstract static class Descriptor {
         public abstract String getSummary();
         public abstract String getFull();
 
@@ -55,7 +55,7 @@ public abstract class InterestGroupData {
 
         @AutoValue.Builder
         @JsonPOJOBuilder(withPrefix = "set")
-        public static abstract class Builder {
+        public abstract static class Builder {
             public abstract Builder setSummary(String summary);
             public abstract Builder setFull(String full);
             public abstract Descriptor build();
diff --git a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
index b4c113c8ae22cc2d4791eb8ecb277958e2607cdd..c56f56da55063036bd5f9b404ad66e6a763700af 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
@@ -47,7 +47,7 @@ public class DefaultInterestGroupService implements InterestGroupService {
                 .stream()
                 .map(ig -> Project
                         .builder()
-                        .setProjectId(ig.getFoundationdbProjectId())
+                        .setProjectId(ig.getProjectId())
                         .setGerritRepos(Collections.emptyList())
                         .setGithubRepos(Collections.emptyList())
                         .setGitlabRepos(Collections.emptyList())
diff --git a/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java b/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
index 477248204ec451030cdd24f947aad35794053bbe..e52ff5ce3e1e78b391b8adf15d8efba67c7902b5 100644
--- a/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
+++ b/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
@@ -127,7 +127,7 @@ public class MockProjectsAPI implements ProjectsAPI {
                 .ok(Arrays
                         .asList(InterestGroupData
                                 .builder()
-                                .setFoundationdbProjectId("foundation-internal.ig.mittens")
+                                .setProjectId("foundation-internal.ig.mittens")
                                 .setId("1")
                                 .setLogo("")
                                 .setState("active")