diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java
index ed089b2e9d97..896aeebe096f 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java
@@ -226,7 +226,7 @@ public String obsolete() {
    * Returns the timestamp (in milliseconds since epoch) on or after which the deprecation state of
    * this resource will be changed to {@link Status#DELETED}. Returns {@code null} if not set.
    *
-   * @throws IllegalArgumentException if {@link #deleted()} is not a valid date, time or datetime
+   * @throws IllegalStateException if {@link #deleted()} is not a valid date, time or datetime
    */
   public Long deletedMillis() {
     try {
@@ -240,7 +240,7 @@ public Long deletedMillis() {
    * Returns the timestamp (in milliseconds since epoch) on or after which the deprecation state of
    * this resource will be changed to {@link Status#DEPRECATED}. Returns {@code null} if not set.
    *
-   * @throws IllegalArgumentException if {@link #deprecated()} is not a valid date, time or datetime
+   * @throws IllegalStateException if {@link #deprecated()} is not a valid date, time or datetime
    */
   public Long deprecatedMillis() {
     try {
@@ -254,7 +254,7 @@ public Long deprecatedMillis() {
    * Returns the timestamp (in milliseconds since epoch) on or after which the deprecation state of
    * this resource will be changed to {@link Status#OBSOLETE}. Returns {@code null} if not set.
    *
-   * @throws IllegalArgumentException if {@link #obsolete()} is not a valid date, time or datetime
+   * @throws IllegalStateException if {@link #obsolete()} is not a valid date, time or datetime
    */
   public Long obsoleteMillis() {
     try {
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageInfo.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageInfo.java
index 2f30223fd508..c243154cec4e 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageInfo.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageInfo.java
@@ -38,7 +38,7 @@
  * images of certain operating systems that you can use, or you can create a custom image. A custom
  * image is an image created from one of your virtual machine instances that contains your specific
  * instance configurations. Use {@link DiskImageConfiguration} to create an image from an existing
- * disk. Use {@link StorageImageConfiguration} to create an image from a raw image stored in Google
+ * disk. Use {@link StorageImageConfiguration} to create an image from a file stored in Google
  * Cloud Storage.
  *
  * @see <a href="https://cloud.google.com/compute/docs/images">Images</a>
@@ -115,8 +115,8 @@ public abstract static class Builder {
 
     /**
      * Sets the image configuration. Use {@link DiskImageConfiguration} to create an image from an
-     * existing disk. Use {@link StorageImageConfiguration} to create an image from a raw image
-     * stored in Google Cloud Storage.
+     * existing disk. Use {@link StorageImageConfiguration} to create an image from a file stored in
+     * Google Cloud Storage.
      */
     public abstract  Builder configuration(ImageConfiguration configuration);
 
@@ -287,7 +287,7 @@ public String description() {
    * Returns the image configuration. This method returns an instance of
    * {@link DiskImageConfiguration} if the the image was created from a Google Compute Engine disk.
    * This method returns an instance of {@link StorageImageConfiguration} if the image was created
-   * from a raw image stored in Google Cloud Storage.
+   * from a file stored in Google Cloud Storage.
    */
   @SuppressWarnings("unchecked")
   public <T extends ImageConfiguration> T configuration() {
@@ -393,7 +393,7 @@ Image toPb() {
   /**
    * Returns a builder for an {@code ImageInfo} object given the image identity and an image
    * configuration. Use {@link DiskImageConfiguration} to create an image from an existing disk. Use
-   * {@link StorageImageConfiguration} to create an image from a raw image stored in Google Cloud
+   * {@link StorageImageConfiguration} to create an image from a file stored in Google Cloud
    * Storage.
    */
   public static Builder builder(ImageId imageId, ImageConfiguration configuration) {
@@ -403,7 +403,7 @@ public static Builder builder(ImageId imageId, ImageConfiguration configuration)
   /**
    * Returns an {@code ImageInfo} object given the image identity and an image configuration. Use
    * {@link DiskImageConfiguration} to create an image from an existing disk. Use
-   * {@link StorageImageConfiguration} to create an image from a raw image stored in Google Cloud
+   * {@link StorageImageConfiguration} to create an image from a file stored in Google Cloud
    * Storage.
    */
   public static ImageInfo of(ImageId imageId, ImageConfiguration configuration) {
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/StorageImageConfiguration.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/StorageImageConfiguration.java
index ca4afd57bf89..a09be89aefe6 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/StorageImageConfiguration.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/StorageImageConfiguration.java
@@ -24,8 +24,8 @@
 import java.util.Objects;
 
 /**
- * A Google Compute Engine raw image configuration. This class can be used to create images from a
- * Google Cloud Storage URL where the disk image is stored.
+ * A Google Compute Engine image configuration used to create images from a Google Cloud Storage
+ * URL where the disk image is stored.
  */
 public class StorageImageConfiguration extends ImageConfiguration {