diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Status.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Status.java
index 6fef0b63..a87ff9f0 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Status.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Status.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
  */
 public enum Status {
 
-    PENDING, PROCESSING, VALID, INVALID, REVOKED, DEACTIVATED, GOOD, UNKNOWN;
+    PENDING, PROCESSING, VALID, INVALID, REVOKED, DEACTIVATED, UNKNOWN;
 
     /**
      * Parses the string and returns a corresponding Status object.
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java
index 84acc327..7621de57 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java
@@ -132,7 +132,7 @@ public class RegistrationTest {
         assertThat(registration.getTermsOfServiceAgreed(), is(true));
         assertThat(registration.getContacts(), hasSize(1));
         assertThat(registration.getContacts().get(0), is(URI.create("mailto:foo2@example.com")));
-        assertThat(registration.getStatus(), is(Status.GOOD));
+        assertThat(registration.getStatus(), is(Status.VALID));
 
         Iterator<Authorization> authIt = registration.getAuthorizations();
         assertThat(authIt, not(nullValue()));
@@ -202,7 +202,7 @@ public class RegistrationTest {
         // Subsequent queries do not trigger another load
         requestWasSent.set(false);
         assertThat(registration.getTermsOfServiceAgreed(), is(true));
-        assertThat(registration.getStatus(), is(Status.GOOD));
+        assertThat(registration.getStatus(), is(Status.VALID));
         assertThat(requestWasSent.get(), is(false));
 
         provider.close();
diff --git a/acme4j-client/src/test/resources/json/updateRegistrationResponse.json b/acme4j-client/src/test/resources/json/updateRegistrationResponse.json
index c3eccbb9..3103eebb 100644
--- a/acme4j-client/src/test/resources/json/updateRegistrationResponse.json
+++ b/acme4j-client/src/test/resources/json/updateRegistrationResponse.json
@@ -2,7 +2,7 @@
   "contact": [
     "mailto:foo2@example.com"
   ],
-  "status": "good",
+  "status": "valid",
   "terms-of-service-agreed": true,
   "authorizations": "https://example.com/acme/reg/1/authz",
   "certificates": "https://example.com/acme/reg/1/cert"
diff --git a/acme4j-it/src/test/java/org/shredzone/acme4j/it/RegistrationIT.java b/acme4j-it/src/test/java/org/shredzone/acme4j/it/RegistrationIT.java
index 8681550d..f527ef27 100644
--- a/acme4j-it/src/test/java/org/shredzone/acme4j/it/RegistrationIT.java
+++ b/acme4j-it/src/test/java/org/shredzone/acme4j/it/RegistrationIT.java
@@ -51,8 +51,8 @@ public class RegistrationIT extends PebbleITBase {
 
         // Check registered data
         assertThat(reg.getContacts(), contains(URI.create("mailto:acme@example.com")));
-        // TODO PEBBLE: Sends UNKNOWN instead of GOOD
-        // assertThat(reg.getStatus(), is(Status.GOOD));
+        // TODO PEBBLE: Sends UNKNOWN instead of VALID
+        // assertThat(reg.getStatus(), is(Status.VALID));
         assertThat(reg.getTermsOfServiceAgreed(), is(true));
 
         // Bind another Registration object
@@ -61,7 +61,7 @@ public class RegistrationIT extends PebbleITBase {
         // Registration reg2 = Registration.bind(session2, location);
         // assertThat(reg2.getLocation(), is(location));
         // assertThat(reg2.getContacts(), contains(URI.create("mailto:acme@example.com")));
-        // assertThat(reg2.getStatus(), is(Status.GOOD));
+        // assertThat(reg2.getStatus(), is(Status.VALID));
         // assertThat(reg2.getTermsOfServiceAgreed(), is(true));
     }
 
@@ -114,7 +114,7 @@ public class RegistrationIT extends PebbleITBase {
 
         Session sessionNewKey = new Session(pebbleURI(), newKeyPair);
         Registration newRegistration = Registration.bind(sessionNewKey, location);
-        assertThat(newRegistration.getStatus(), is(Status.GOOD));
+        assertThat(newRegistration.getStatus(), is(Status.VALID));
     }
 
     @Test