diff --git a/API/DW.Androidapi.JNI.AndroidX.TvProvider.pas b/API/DW.Androidapi.JNI.AndroidX.TvProvider.pas
index 2b1f1763..4c241ebb 100644
--- a/API/DW.Androidapi.JNI.AndroidX.TvProvider.pas
+++ b/API/DW.Androidapi.JNI.AndroidX.TvProvider.pas
@@ -178,32 +178,32 @@   TJBaseProgram = class(TJavaGenericImport<JBaseProgramClass, JBaseProgram>) end
   [JavaSignature('androidx/tvprovider/media/tv/BaseProgram$Builder')]
   JBaseProgram_Builder = interface(JObject)
     ['{5F807D1E-F8F3-4B0E-9436-87422192BA93}']
-    function setAudioLanguages(strings: TJavaObjectArray<JString>): JObject; cdecl;
-    function setCanonicalGenres(strings: TJavaObjectArray<JString>): JObject; cdecl;
-    function setContentRatings(tvcontentratings: TJavaObjectArray<JTvContentRating>): JObject; cdecl;
-    function setDescription(string_1: JString): JObject; cdecl;
-    function setEpisodeNumber(int: Integer): JObject; overload; cdecl;
-    function setEpisodeNumber(string_1: JString; int: Integer): JObject; overload; cdecl;
-    function setEpisodeTitle(string_1: JString): JObject; cdecl;
-    function setId(long: Int64): JObject; cdecl;
-    function setInternalProviderData(bytes: TJavaArray<Byte>): JObject; cdecl;
-    function setInternalProviderFlag1(long: Int64): JObject; cdecl;
-    function setInternalProviderFlag2(long: Int64): JObject; cdecl;
-    function setInternalProviderFlag3(long: Int64): JObject; cdecl;
-    function setInternalProviderFlag4(long: Int64): JObject; cdecl;
-    function setLongDescription(string_1: JString): JObject; cdecl;
-    function setPackageName(string_1: JString): JObject; cdecl;
-    function setPosterArtUri(uri: Jnet_Uri): JObject; cdecl;
-    function setReviewRating(string_1: JString): JObject; cdecl;
-    function setReviewRatingStyle(int: Integer): JObject; cdecl;
-    function setSearchable(boolean: Boolean): JObject; cdecl;
-    function setSeasonNumber(int: Integer): JObject; overload; cdecl;
-    function setSeasonNumber(string_1: JString; int: Integer): JObject; overload; cdecl;
-    function setSeasonTitle(string_1: JString): JObject; cdecl;
-    function setThumbnailUri(uri: Jnet_Uri): JObject; cdecl;
-    function setTitle(string_1: JString): JObject; cdecl;
-    function setVideoHeight(int: Integer): JObject; cdecl;
-    function setVideoWidth(int: Integer): JObject; cdecl;
+    function setAudioLanguages(strings: TJavaObjectArray<JString>): JBaseProgram_Builder; cdecl;
+    function setCanonicalGenres(strings: TJavaObjectArray<JString>): JBaseProgram_Builder; cdecl;
+    function setContentRatings(tvcontentratings: TJavaObjectArray<JTvContentRating>): JBaseProgram_Builder; cdecl;
+    function setDescription(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setEpisodeNumber(int: Integer): JBaseProgram_Builder; overload; cdecl;
+    function setEpisodeNumber(string_1: JString; int: Integer): JBaseProgram_Builder; overload; cdecl;
+    function setEpisodeTitle(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setId(long: Int64): JBaseProgram_Builder; cdecl;
+    function setInternalProviderData(bytes: TJavaArray<Byte>): JBaseProgram_Builder; cdecl;
+    function setInternalProviderFlag1(long: Int64): JBaseProgram_Builder; cdecl;
+    function setInternalProviderFlag2(long: Int64): JBaseProgram_Builder; cdecl;
+    function setInternalProviderFlag3(long: Int64): JBaseProgram_Builder; cdecl;
+    function setInternalProviderFlag4(long: Int64): JBaseProgram_Builder; cdecl;
+    function setLongDescription(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setPackageName(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setPosterArtUri(uri: Jnet_Uri): JBaseProgram_Builder; cdecl;
+    function setReviewRating(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setReviewRatingStyle(int: Integer): JBaseProgram_Builder; cdecl;
+    function setSearchable(boolean: Boolean): JBaseProgram_Builder; cdecl;
+    function setSeasonNumber(int: Integer): JBaseProgram_Builder; overload; cdecl;
+    function setSeasonNumber(string_1: JString; int: Integer): JBaseProgram_Builder; overload; cdecl;
+    function setSeasonTitle(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setThumbnailUri(uri: Jnet_Uri): JBaseProgram_Builder; cdecl;
+    function setTitle(string_1: JString): JBaseProgram_Builder; cdecl;
+    function setVideoHeight(int: Integer): JBaseProgram_Builder; cdecl;
+    function setVideoWidth(int: Integer): JBaseProgram_Builder; cdecl;
   end;
   TJBaseProgram_Builder = class(TJavaGenericImport<JBaseProgram_BuilderClass, JBaseProgram_Builder>) end;
 
@@ -259,35 +259,35 @@   TJBasePreviewProgram = class(TJavaGenericImport<JBasePreviewProgramClass, JBas
   [JavaSignature('androidx/tvprovider/media/tv/BasePreviewProgram$Builder')]
   JBasePreviewProgram_Builder = interface(JBaseProgram_Builder)
     ['{2B8C04C5-90DE-470F-844A-06126463B4AC}']
-    function setAuthor(string_1: JString): JObject; cdecl;
-    function setAvailability(int: Integer): JObject; cdecl;
-    function setBrowsable(boolean: Boolean): JObject; cdecl;
-    function setContentId(string_1: JString): JObject; cdecl;
-    function setDurationMillis(int: Integer): JObject; cdecl;
-    function setEndTimeUtcMillis(long: Int64): JObject; cdecl;
-    function setGenre(string_1: JString): JObject; cdecl;
-    function setIntent(intent: JIntent): JObject; cdecl;
-    function setIntentUri(uri: Jnet_Uri): JObject; cdecl;
-    function setInteractionCount(long: Int64): JObject; cdecl;
-    function setInteractionType(int: Integer): JObject; cdecl;
-    function setInternalProviderId(string_1: JString): JObject; cdecl;
-    function setItemCount(int: Integer): JObject; cdecl;
-    function setLastPlaybackPositionMillis(int: Integer): JObject; cdecl;
-    function setLive(boolean: Boolean): JObject; cdecl;
-    function setLogoContentDescription(string_1: JString): JObject; cdecl;
-    function setLogoUri(uri: Jnet_Uri): JObject; cdecl;
-    function setOfferPrice(string_1: JString): JObject; cdecl;
-    function setPosterArtAspectRatio(int: Integer): JObject; cdecl;
-    function setPreviewAudioUri(uri: Jnet_Uri): JObject; cdecl;
-    function setPreviewVideoUri(uri: Jnet_Uri): JObject; cdecl;
-    function setReleaseDate(date: JDate): JObject; overload; cdecl;
-    function setReleaseDate(string_1: JString): JObject; overload; cdecl;
-    function setStartTimeUtcMillis(long: Int64): JObject; cdecl;
-    function setStartingPrice(string_1: JString): JObject; cdecl;
-    function setThumbnailAspectRatio(int: Integer): JObject; cdecl;
-    function setTransient(boolean: Boolean): JObject; cdecl;
-    function setTvSeriesItemType(int: Integer): JObject; cdecl;
-    function setType(int: Integer): JObject; cdecl;
+    function setAuthor(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setAvailability(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setBrowsable(boolean: Boolean): JBasePreviewProgram_Builder; cdecl;
+    function setContentId(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setDurationMillis(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setEndTimeUtcMillis(long: Int64): JBasePreviewProgram_Builder; cdecl;
+    function setGenre(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setIntent(intent: JIntent): JBasePreviewProgram_Builder; cdecl;
+    function setIntentUri(uri: Jnet_Uri): JBasePreviewProgram_Builder; cdecl;
+    function setInteractionCount(long: Int64): JBasePreviewProgram_Builder; cdecl;
+    function setInteractionType(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setInternalProviderId(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setItemCount(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setLastPlaybackPositionMillis(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setLive(boolean: Boolean): JBasePreviewProgram_Builder; cdecl;
+    function setLogoContentDescription(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setLogoUri(uri: Jnet_Uri): JBasePreviewProgram_Builder; cdecl;
+    function setOfferPrice(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setPosterArtAspectRatio(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setPreviewAudioUri(uri: Jnet_Uri): JBasePreviewProgram_Builder; cdecl;
+    function setPreviewVideoUri(uri: Jnet_Uri): JBasePreviewProgram_Builder; cdecl;
+    function setReleaseDate(date: JDate): JBasePreviewProgram_Builder; overload; cdecl;
+    function setReleaseDate(string_1: JString): JBasePreviewProgram_Builder; overload; cdecl;
+    function setStartTimeUtcMillis(long: Int64): JBasePreviewProgram_Builder; cdecl;
+    function setStartingPrice(string_1: JString): JBasePreviewProgram_Builder; cdecl;
+    function setThumbnailAspectRatio(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setTransient(boolean: Boolean): JBasePreviewProgram_Builder; cdecl;
+    function setTvSeriesItemType(int: Integer): JBasePreviewProgram_Builder; cdecl;
+    function setType(int: Integer): JBasePreviewProgram_Builder; cdecl;
   end;
   TJBasePreviewProgram_Builder = class(TJavaGenericImport<JBasePreviewProgram_BuilderClass, JBasePreviewProgram_Builder>) end;