diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
index d0b6d12ea..1605a786a 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
@@ -27,6 +27,8 @@ class Action {
 		public Map<String, String> header;
 	}
 
+	// TODO(ms): rename this class in next major release
+	@SuppressWarnings("JavaLangClash")
 	/** Describes an error to be returned by the LFS batch API */
 	class Error {
 		public int code;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
index b569416e8..c7e45043d 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
@@ -30,6 +30,8 @@ public class LfsGson {
 	/**
 	 * Wrapper class only used for serialization of error messages.
 	 */
+	// TODO(ms): rename this class in next major release
+	@SuppressWarnings("JavaLangClash")
 	static class Error {
 		String message;
 
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
index f9bd1ba0f..f3edf86cf 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
@@ -87,6 +87,8 @@ class ExpiringAction extends Action {
 	}
 
 	/** Describes an error to be returned by the LFS batch API */
+	// TODO(ms): rename this class in next major release
+	@SuppressWarnings("JavaLangClash")
 	class Error {
 		public int code;
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
index 6c61cdf2b..c18c83304 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java
@@ -162,6 +162,8 @@ public static class Result {
 		 *
 		 * @since 6.6
 		 */
+		// TODO(ms): rename this class in next major release
+		@SuppressWarnings("JavaLangClash")
 		public static class Error {
 
 			private String msg;