diff --git a/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java b/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
index c07750fc1c510f75d747cbe1a098ffd76c98a66b..f1cd8f7d5ae3b7eadb86385dc41d24e3ea1100c8 100644
--- a/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
@@ -45,7 +45,7 @@ public class BMPImageReaderSpi extends ImageReaderSpi {
     private boolean registered = false;
 
     public BMPImageReaderSpi() {
-        super("Sun Microsystems, Inc.",
+        super("Oracle Corporation",
               "1.0",
               formatNames,
               entensions,
diff --git a/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java b/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
index fc8531a5b9d491dc4b0f6d0003dba27dc2e989cc..8a0ad17ef6e0a0dfd696b0a233b42fd44e5c9666 100644
--- a/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
@@ -50,7 +50,7 @@ public class BMPImageWriterSpi extends ImageWriterSpi {
     private boolean registered = false;
 
     public BMPImageWriterSpi() {
-        super("Sun Microsystems, Inc.",
+        super("Oracle Corporation",
               "1.0",
               formatNames,
               entensions,
diff --git a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
index 53702a625b30890af0db2a62c6476f15d2d3da1b..45418667047df5ad550945f8dacd42f7f318d6f0 100644
--- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
@@ -36,7 +36,7 @@ import javax.imageio.stream.ImageInputStream;
 
 public class GIFImageReaderSpi extends ImageReaderSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
index 8660d3c06122ab1cea93eb375227371d74069ac4..c8ec748b096e771d59021063b6b8ffe2d7e0ca55 100644
--- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
@@ -36,7 +36,7 @@ import com.sun.imageio.plugins.common.PaletteBuilder;
 
 public class GIFImageWriterSpi extends ImageWriterSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
index 17c9f9e53501fb7797d567623976f42620a68c24..1ed3390671040807de7f696915001e31b6bbfb46 100644
--- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
+++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
@@ -169,7 +169,7 @@ public class JPEG {
     public static final int ADOBE_YCCK = 2;
 
     // Spi initialization stuff
-    public static final String vendor = "Sun Microsystems, Inc.";
+    public static final String vendor = "Oracle Corporation";
     public static final String version = "0.5";
     // Names of the formats we can read or write
     public static final String [] names = {"JPEG", "jpeg", "JPG", "jpg"};
diff --git a/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java b/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
index a0f58ad97f5249e8cb4d124c3629723922b62896..d6d277d535300b6838e8f735c385bf9a75f80cf6 100644
--- a/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
@@ -36,7 +36,7 @@ import javax.imageio.stream.ImageInputStream;
 
 public class PNGImageReaderSpi extends ImageReaderSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java b/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
index 9a007c50fafaf10adc13191599228e799d5330c4..312c413f6a46344256606fdee4651e4132a4fefd 100644
--- a/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
@@ -38,7 +38,7 @@ import javax.imageio.stream.ImageOutputStream;
 
 public class PNGImageWriterSpi extends ImageWriterSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
index 8beb36b35da5ffa334386f7179b8d76311345e3f..485d1105ac430948af4a877b8711a8c9965d6d07 100644
--- a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
@@ -49,7 +49,7 @@ public class WBMPImageReaderSpi extends ImageReaderSpi {
     private boolean registered = false;
 
     public WBMPImageReaderSpi() {
-        super("Sun Microsystems, Inc.",
+        super("Oracle Corporation",
               "1.0",
               formatNames,
               entensions,
diff --git a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
index 9ba4fd3fc56ec1f0648836c65a0aeab625e288bd..43a2bfae649fd9259a378238a6021f05607e7ca0 100644
--- a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
+++ b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
@@ -49,7 +49,7 @@ public class WBMPImageWriterSpi extends ImageWriterSpi {
     private boolean registered = false;
 
     public WBMPImageWriterSpi() {
-        super("Sun Microsystems, Inc.",
+        super("Oracle Corporation",
               "1.0",
               formatNames,
               entensions,
diff --git a/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
index 09b77006ff384d65ebc55b0e7fc94ddebb49a32c..48f854aa6c2cad55f0255ab5c1917191f375b680 100644
--- a/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
@@ -33,7 +33,7 @@ import javax.imageio.stream.FileImageInputStream;
 
 public class FileImageInputStreamSpi extends ImageInputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
index 98285999054ddeb69f7e8a3255624d8296c1b449..f947f19adf06001d06789f8bf9a613694002c757 100644
--- a/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
@@ -33,7 +33,7 @@ import javax.imageio.stream.FileImageOutputStream;
 
 public class FileImageOutputStreamSpi extends ImageOutputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
index 7f7abb725ced81d314657290ae9ddea446f96f1b..62f6229422969cc2f7b30f64f6c3d33fa34bce25 100644
--- a/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
@@ -36,7 +36,7 @@ import javax.imageio.stream.MemoryCacheImageInputStream;
 
 public class InputStreamImageInputStreamSpi extends ImageInputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
index eae89a31af2a957454e47875675ce93cab302f65..b1a6b0c40dd58eff52150a12fc2720f50ff3dd4e 100644
--- a/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
@@ -36,7 +36,7 @@ import javax.imageio.stream.MemoryCacheImageOutputStream;
 
 public class OutputStreamImageOutputStreamSpi extends ImageOutputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
index ac15f6c298237314bbefd7dcf992613c7c6ae40d..7d6107a6925f8267eaa1f65e94a04523489222de 100644
--- a/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
@@ -34,7 +34,7 @@ import javax.imageio.stream.FileImageInputStream;
 
 public class RAFImageInputStreamSpi extends ImageInputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";
 
diff --git a/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java b/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
index 9122b2b51dad0afb366539cf435c9f6bac85197f..037cdcf5071a5c458e9bc002c0585f24757bd24a 100644
--- a/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
+++ b/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
@@ -34,7 +34,7 @@ import javax.imageio.stream.FileImageOutputStream;
 
 public class RAFImageOutputStreamSpi extends ImageOutputStreamSpi {
 
-    private static final String vendorName = "Sun Microsystems, Inc.";
+    private static final String vendorName = "Oracle Corporation";
 
     private static final String version = "1.0";