diff --git a/src/main/java/com/google/api/resourcenames/ResourceName.java b/src/main/java/com/google/api/resourcenames/ResourceName.java
index c0d06969a..54225babc 100644
--- a/src/main/java/com/google/api/resourcenames/ResourceName.java
+++ b/src/main/java/com/google/api/resourcenames/ResourceName.java
@@ -37,6 +37,11 @@
 @BetaApi
 public interface ResourceName {
 
-  /** The ResourceNameType of the resource name object. */
+  /**
+   * The ResourceNameType of the resource name object.
+   *
+   * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
+   */
+  @Deprecated
   public ResourceNameType getType();
 }
diff --git a/src/main/java/com/google/api/resourcenames/ResourceNameType.java b/src/main/java/com/google/api/resourcenames/ResourceNameType.java
index 4022845d3..0fb3fabef 100644
--- a/src/main/java/com/google/api/resourcenames/ResourceNameType.java
+++ b/src/main/java/com/google/api/resourcenames/ResourceNameType.java
@@ -36,6 +36,9 @@
 /**
  * An interface that resource name types must implement. A ResourceNameType class is required for
  * any class that implements {@link ResourceName}.
+ *
+ * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
  */
 @BetaApi
+@Deprecated
 public interface ResourceNameType {}
diff --git a/src/main/java/com/google/api/resourcenames/UntypedResourceName.java b/src/main/java/com/google/api/resourcenames/UntypedResourceName.java
index c05677d34..e47a98975 100644
--- a/src/main/java/com/google/api/resourcenames/UntypedResourceName.java
+++ b/src/main/java/com/google/api/resourcenames/UntypedResourceName.java
@@ -48,10 +48,18 @@ private UntypedResourceName(String rawValue) {
     this.rawValue = Preconditions.checkNotNull(rawValue);
   }
 
+  /**
+   * @deprecated use {@link #of(ResourceName)} instead.
+   */
+  @Deprecated
   public static UntypedResourceName from(ResourceName resourceName) {
     return new UntypedResourceName(resourceName.toString());
   }
 
+  public static UntypedResourceName of(ResourceName resourceName) {
+    return new UntypedResourceName(resourceName.toString());
+  }
+
   public static UntypedResourceName parse(String formattedString) {
     return new UntypedResourceName(formattedString);
   }
@@ -60,7 +68,12 @@ public static boolean isParsableFrom(String formattedString) {
     return true;
   }
 
+  /*
+   * @deprecated With Oneof types being converted to use inheritance, this is
+   * no longer necessary.
+   */
   @Override
+  @Deprecated
   public ResourceNameType getType() {
     return UntypedResourceNameType.instance();
   }
diff --git a/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java b/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java
index f7b79791c..873241f28 100644
--- a/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java
+++ b/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java
@@ -33,8 +33,13 @@
 
 import com.google.api.core.BetaApi;
 
-/** The ResourceNameType for {@link UntypedResourceName}. */
+/**
+ * The ResourceNameType for {@link UntypedResourceName}.
+ *
+ * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
+ */
 @BetaApi
+@Deprecated
 public class UntypedResourceNameType implements ResourceNameType {
 
   private static UntypedResourceNameType instance = new UntypedResourceNameType();