diff --git a/src/main/java/org/springframework/hateoas/Link.java b/src/main/java/org/springframework/hateoas/Link.java
index 12ff82d1..7177a1c9 100755
--- a/src/main/java/org/springframework/hateoas/Link.java
+++ b/src/main/java/org/springframework/hateoas/Link.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.io.Serializable;
 import java.net.URI;
@@ -89,14 +89,14 @@ public class Link implements Serializable {
 	public static final @Deprecated LinkRelation REL_LAST = IanaLinkRelations.LAST;
 
 	private LinkRelation rel;
-	private @Wither String href;
-	private @Wither String hreflang;
-	private @Wither String media;
-	private @Wither String title;
-	private @Wither String type;
-	private @Wither String deprecation;
-	private @Wither String profile;
-	private @Wither String name;
+	private @With String href;
+	private @With String hreflang;
+	private @With String media;
+	private @With String title;
+	private @With String type;
+	private @With String deprecation;
+	private @With String profile;
+	private @With String name;
 	private @JsonIgnore UriTemplate template;
 	private @JsonIgnore List<Affordance> affordances;
 
diff --git a/src/main/java/org/springframework/hateoas/QueryParameter.java b/src/main/java/org/springframework/hateoas/QueryParameter.java
index 76092f79..6b9229b5 100644
--- a/src/main/java/org/springframework/hateoas/QueryParameter.java
+++ b/src/main/java/org/springframework/hateoas/QueryParameter.java
@@ -18,7 +18,7 @@ package org.springframework.hateoas;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.Optional;
 
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public class QueryParameter {
 
 	private final String name;
-	private final @Nullable @Wither String value;
+	private final @Nullable @With String value;
 	private final boolean required;
 
 	/**
diff --git a/src/main/java/org/springframework/hateoas/client/Hop.java b/src/main/java/org/springframework/hateoas/client/Hop.java
index ff1354e5..fd99dd7f 100644
--- a/src/main/java/org/springframework/hateoas/client/Hop.java
+++ b/src/main/java/org/springframework/hateoas/client/Hop.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -49,12 +49,12 @@ public class Hop {
 	/**
 	 * Collection of URI Template parameters.
 	 */
-	private final @Wither Map<String, Object> parameters;
+	private final @With Map<String, Object> parameters;
 
 	/**
 	 * Extra {@link HttpHeaders} to apply to this hop.
 	 */
-	private final @Wither HttpHeaders headers;
+	private final @With HttpHeaders headers;
 
 	/**
 	 * Creates a new {@link Hop} for the given relation name.
diff --git a/src/main/java/org/springframework/hateoas/mediatype/Affordances.java b/src/main/java/org/springframework/hateoas/mediatype/Affordances.java
index 950949f0..52941746 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/Affordances.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/Affordances.java
@@ -20,7 +20,7 @@ import static java.util.stream.Collectors.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -98,12 +98,12 @@ public class Affordances implements AffordanceOperations {
 		private final Affordances context;
 
 		private final HttpMethod method;
-		private final @Wither Link target;
+		private final @With Link target;
 		private final InputPayloadMetadata inputMetdata;
 		private final PayloadMetadata outputMetadata;
 
 		private List<QueryParameter> parameters = Collections.emptyList();
-		private @Nullable @Wither String name;
+		private @Nullable @With String name;
 
 		/**
 		 * Registers the given type as input and output model for the affordance.
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java
index 96b22d56..3a77536e 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java
@@ -18,7 +18,7 @@ package org.springframework.hateoas.mediatype.collectionjson;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 class CollectionJson<T> {
 
 	private String version;
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java
index d1c76b20..bb7a22de 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java
@@ -17,7 +17,7 @@ package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.Getter;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import org.springframework.lang.Nullable;
 
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 @Value
 @Getter(onMethod = @__(@JsonProperty))
 @JsonInclude(Include.NON_NULL)
-@Wither
+@With
 class CollectionJsonData {
 
 	private @Nullable String name;
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java
index f61ac0c7..8251187c 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class CollectionJsonDocument<T> {
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonError.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonError.java
index aa5ec7f4..644928cd 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonError.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonError.java
@@ -17,7 +17,7 @@ package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import org.springframework.lang.Nullable;
 
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 class CollectionJsonError {
 
 	private String title;
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java
index 0b570495..bc664eb2 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.Collections;
 import java.util.List;
@@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.JavaType;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class CollectionJsonItem<T> {
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
index 0047d4d8..60d7077b 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
@@ -18,7 +18,7 @@ package org.springframework.hateoas.mediatype.collectionjson;
 import static com.fasterxml.jackson.annotation.JsonInclude.*;
 
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
-@Wither
+@With
 class CollectionJsonQuery {
 
 	@JsonInclude(Include.NON_NULL) private String rel;
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonTemplate.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonTemplate.java
index b38bfee3..980c2df0 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonTemplate.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonTemplate.java
@@ -16,7 +16,7 @@
 package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
-@Wither
+@With
 class CollectionJsonTemplate {
 
 	private List<CollectionJsonData> data;
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalConfiguration.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalConfiguration.java
index 56add202..5d25230b 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.hateoas.mediatype.hal;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -45,20 +45,20 @@ public class HalConfiguration {
 	 * Configures how to render links in case there is exactly one defined for a given link relation in general. By
 	 * default, this single link will be rendered as nested document.
 	 */
-	private final @Wither @Getter RenderSingleLinks renderSingleLinks;
-	private final @Wither(AccessLevel.PRIVATE) Map<String, RenderSingleLinks> singleLinksPerPattern;
+	private final @With @Getter RenderSingleLinks renderSingleLinks;
+	private final @With(AccessLevel.PRIVATE) Map<String, RenderSingleLinks> singleLinksPerPattern;
 
 	/**
 	 * Configures whether the Jackson property naming strategy is applied to link relations and within {@code _embedded}
 	 * clauses.
 	 */
-	private final @Wither @Getter boolean applyPropertyNamingStrategy;
+	private final @With @Getter boolean applyPropertyNamingStrategy;
 
 	/**
 	 * Configures whether to always use collections for embeddeds, even if there's only one entry for a link relation.
 	 * Defaults to {@literal true}.
 	 */
-	private final @Wither @Getter boolean enforceEmbeddedCollections;
+	private final @With @Getter boolean enforceEmbeddedCollections;
 
 	/**
 	 * Creates a new default {@link HalConfiguration} rendering single links as immediate sub-document.
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java
index eb46a099..0f8cc1a1 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java
@@ -17,7 +17,7 @@ package org.springframework.hateoas.mediatype.hal;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -56,7 +56,7 @@ class HalEmbeddedBuilder {
 	/**
 	 * Returns a {@link HalEmbeddedBuilder} with the given transformer
 	 */
-	private final @Wither Function<String, String> relationTransformer;
+	private final @With Function<String, String> relationTransformer;
 
 	/**
 	 * Creates a new {@link HalEmbeddedBuilder} using the given {@link LinkRelationProvider} and prefer collection rels
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java
index d42562e3..f033c234 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -56,14 +56,14 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
  * @author Oliver Gierke
  */
 @Value
-@Wither
+@With
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 @JsonPropertyOrder({ "attributes", "entity", "entities", "embedded", "links", "templates", "metadata" })
 public class HalFormsDocument<T> {
 
 	@Nullable //
 	@Getter(onMethod = @__(@JsonAnyGetter)) @JsonInclude(Include.NON_EMPTY) //
-	@Wither(AccessLevel.PRIVATE) //
+	@With(AccessLevel.PRIVATE) //
 	private Map<String, Object> attributes;
 
 	@Nullable //
@@ -74,7 +74,7 @@ public class HalFormsDocument<T> {
 	@Nullable //
 	@JsonInclude(Include.NON_EMPTY) //
 	@JsonIgnore //
-	@Wither(AccessLevel.PRIVATE) //
+	@With(AccessLevel.PRIVATE) //
 	private Collection<T> entities;
 
 	@JsonProperty("_embedded") //
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java
index f64a4eee..6f5b5063 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.ToString;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import org.springframework.hateoas.AffordanceModel.Named;
 import org.springframework.hateoas.AffordanceModel.PropertyMetadata;
@@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_DEFAULT)
 @Value
-@Wither
+@With
 @Getter(onMethod = @__(@JsonProperty))
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(force = true)
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplate.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplate.java
index 24cd9479..84d5fb69 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplate.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplate.java
@@ -22,7 +22,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -53,7 +53,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
  */
 @Data
 @Setter(AccessLevel.NONE)
-@Wither
+@With
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @EqualsAndHashCode
 @ToString
@@ -65,7 +65,7 @@ public class HalFormsTemplate {
 	public static final String DEFAULT_KEY = "default";
 
 	private @Getter(onMethod = @__(@JsonInclude(Include.NON_EMPTY))) String title;
-	private @Wither(AccessLevel.PRIVATE) HttpMethod httpMethod;
+	private @With(AccessLevel.PRIVATE) HttpMethod httpMethod;
 	private List<HalFormsProperty> properties;
 	private List<MediaType> contentTypes;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java b/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java
index e8112611..99e79d78 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java
@@ -22,8 +22,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.Value;
+import lombok.With;
 import lombok.experimental.NonFinal;
-import lombok.experimental.Wither;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -52,7 +52,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
  * @author Oliver Drotbohm
  */
 @Getter(onMethod = @__(@JsonProperty))
-@Wither
+@With
 @ToString
 @EqualsAndHashCode
 @JsonInclude(Include.NON_NULL)
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/Uber.java b/src/main/java/org/springframework/hateoas/mediatype/uber/Uber.java
index 6417cd71..fd092578 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/Uber.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/Uber.java
@@ -18,7 +18,7 @@ package org.springframework.hateoas.mediatype.uber;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -39,7 +39,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 @JsonInclude(Include.NON_NULL)
 class Uber {
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java b/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
index 9e81a9a8..393b5580 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -61,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 class UberData {
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/UberDocument.java b/src/main/java/org/springframework/hateoas/mediatype/uber/UberDocument.java
index 19afebe7..12c10da4 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/UberDocument.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/UberDocument.java
@@ -19,7 +19,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Value
 @Getter(onMethod = @__(@JsonProperty))
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class UberDocument {
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/UberError.java b/src/main/java/org/springframework/hateoas/mediatype/uber/UberError.java
index 5e2c668b..1cdeed99 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/UberError.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/UberError.java
@@ -17,7 +17,7 @@ package org.springframework.hateoas.mediatype.uber;
 
 import lombok.AccessLevel;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 1.0
  */
 @Value
-@Wither(AccessLevel.PACKAGE)
+@With(AccessLevel.PACKAGE)
 class UberError {
 
 	private List<UberData> data;