diff --git a/keras/api/golden/v1/tensorflow.keras.-model.pbtxt b/keras/api/golden/v1/tensorflow.keras.-model.pbtxt
index 41ab38df9853..c387e1c45830 100644
--- a/keras/api/golden/v1/tensorflow.keras.-model.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.-model.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.Model"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.-sequential.pbtxt b/keras/api/golden/v1/tensorflow.keras.-sequential.pbtxt
index 48495e4ed13a..6a74bcde08bb 100644
--- a/keras/api/golden/v1/tensorflow.keras.-sequential.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.-sequential.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.Sequential"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.sequential.Sequential\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.functional.Functional\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.sequential.Sequential\'>"
+  is_instance: "<class \'keras.engine.functional.Functional\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-base-logger.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-base-logger.pbtxt
index 9dbdaf0f5f3d..3a8597db7bfd 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-base-logger.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-base-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.BaseLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.BaseLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.BaseLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
index 0725f606e292..fbeada72976d 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.CSVLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.CSVLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.CSVLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-callback-list.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-callback-list.pbtxt
index ddf772c811d4..3835ea4c944a 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-callback-list.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-callback-list.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.callbacks.CallbackList"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.CallbackList\'>"
+  is_instance: "<class \'keras.callbacks.CallbackList\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-callback.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-callback.pbtxt
index 14bfc3bedbfb..faa4541b7094 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-callback.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-callback.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.callbacks.Callback"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-early-stopping.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-early-stopping.pbtxt
index 9812bad8f66f..75512300c8ab 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-early-stopping.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-early-stopping.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.EarlyStopping"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.EarlyStopping\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.EarlyStopping\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-history.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-history.pbtxt
index 5aa739391ef8..379a9f3aa1d5 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-history.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-history.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.History"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.History\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.History\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-lambda-callback.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-lambda-callback.pbtxt
index bf5bcb68df47..61c47980e736 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-lambda-callback.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-lambda-callback.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.LambdaCallback"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.LambdaCallback\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.LambdaCallback\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
index a04ffb92eb9e..02a8faf671e5 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.LearningRateScheduler"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.LearningRateScheduler\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.LearningRateScheduler\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-model-checkpoint.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
index e6cc7aee5a80..6a1825993a30 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ModelCheckpoint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ModelCheckpoint\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ModelCheckpoint\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-progbar-logger.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-progbar-logger.pbtxt
index 624f856d2752..e8f92604bb22 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-progbar-logger.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-progbar-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ProgbarLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ProgbarLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ProgbarLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
index 0fed6fd23670..a7792b964315 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ReduceLROnPlateau"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ReduceLROnPlateau\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ReduceLROnPlateau\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-remote-monitor.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-remote-monitor.pbtxt
index 71cf7f4a4922..98552f19de49 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-remote-monitor.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-remote-monitor.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.RemoteMonitor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.RemoteMonitor\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.RemoteMonitor\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-tensor-board.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-tensor-board.pbtxt
index 2e0c6c978263..ca8b6dd1868c 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-tensor-board.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-tensor-board.pbtxt
@@ -1,9 +1,9 @@
 path: "tensorflow.keras.callbacks.TensorBoard"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks_v1.TensorBoard\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.TensorBoard\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.TensorBoardVersionSelector\'>"
+  is_instance: "<class \'keras.callbacks_v1.TensorBoard\'>"
+  is_instance: "<class \'keras.callbacks.TensorBoard\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.utils.version_utils.TensorBoardVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt b/keras/api/golden/v1/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
index d5a59d870a39..62ccd1ec26b4 100644
--- a/keras/api/golden/v1/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.TerminateOnNaN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.TerminateOnNaN\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.TerminateOnNaN\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-constraint.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-constraint.pbtxt
index 8e07b7d98e1d..b13e4c558f14 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-constraint.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-constraint.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.constraints.Constraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-max-norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-max-norm.pbtxt
index 2b81174b6cd4..b96e2fdc7649 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-max-norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-max-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.MaxNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-min-max-norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-min-max-norm.pbtxt
index a41eda86ac25..85017a5ab9fa 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-min-max-norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-min-max-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.MinMaxNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MinMaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MinMaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-non-neg.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-non-neg.pbtxt
index 572e3eea4d98..278f33d15b82 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-non-neg.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-non-neg.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.NonNeg"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.NonNeg\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.NonNeg\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-radial-constraint.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-radial-constraint.pbtxt
index 826cfb929320..9fa92b2ccc62 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-radial-constraint.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-radial-constraint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.RadialConstraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.RadialConstraint\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.RadialConstraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.-unit-norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.-unit-norm.pbtxt
index fe16c38cc83f..a8ebd4eb371b 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.-unit-norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.-unit-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.UnitNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.UnitNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.UnitNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.max_norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.max_norm.pbtxt
index 6650bae07a0d..bc201d9df1fb 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.max_norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.max_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.max_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.min_max_norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.min_max_norm.pbtxt
index 9dd3bc92fc4f..e260340d0c25 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.min_max_norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.min_max_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.min_max_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MinMaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MinMaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.non_neg.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.non_neg.pbtxt
index a565840939f9..4f8c1d767db8 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.non_neg.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.non_neg.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.non_neg"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.NonNeg\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.NonNeg\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.radial_constraint.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.radial_constraint.pbtxt
index 3040111b3249..8dca693a318b 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.radial_constraint.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.radial_constraint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.radial_constraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.RadialConstraint\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.RadialConstraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.constraints.unit_norm.pbtxt b/keras/api/golden/v1/tensorflow.keras.constraints.unit_norm.pbtxt
index 5cbe0da4c1d1..1aa9da9db057 100644
--- a/keras/api/golden/v1/tensorflow.keras.constraints.unit_norm.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.constraints.unit_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.unit_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.UnitNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.UnitNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
index 58bede556dfd..ada37ff3c675 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.experimental.CosineDecayRestarts"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay.pbtxt
index e2549a2ac627..56f6dc0f9395 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-cosine-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.experimental.CosineDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-linear-model.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-linear-model.pbtxt
index 1a23072830bf..161083818646 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-linear-model.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-linear-model.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.LinearModel"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.premade.linear.LinearModel\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.premade.linear.LinearModel\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
index 93dd8fa99720..72953eda885b 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.PeepholeLSTMCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.PeepholeLSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.PeepholeLSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-sequence-features.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-sequence-features.pbtxt
index 97f2e75199af..d82d683f12d5 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-sequence-features.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-sequence-features.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.experimental.SequenceFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.feature_column.sequence_feature_column.SequenceFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.feature_column.sequence_feature_column.SequenceFeatures\'>"
+  is_instance: "<class \'keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.experimental.-wide-deep-model.pbtxt b/keras/api/golden/v1/tensorflow.keras.experimental.-wide-deep-model.pbtxt
index 3e5cee9e5749..9579dec7e2e0 100644
--- a/keras/api/golden/v1/tensorflow.keras.experimental.-wide-deep-model.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.experimental.-wide-deep-model.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.WideDeepModel"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.premade.wide_deep.WideDeepModel\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.premade.wide_deep.WideDeepModel\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.-initializer.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.-initializer.pbtxt
index 74597c8c7cf4..bbbf17dcface 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.-initializer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.-initializer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.Initializer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.-random-normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.-random-normal.pbtxt
index c395b6c3fda8..06cb91b6642c 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.-random-normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.-random-normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.RandomNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.-random-uniform.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.-random-uniform.pbtxt
index c43acee18817..5b33476ee654 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.-random-uniform.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.-random-uniform.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.RandomUniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.-truncated-normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.-truncated-normal.pbtxt
index 0d6464c0b56d..a5815daa9fd4 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.-truncated-normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.-truncated-normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.TruncatedNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.TruncatedNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.TruncatedNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.he_normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.he_normal.pbtxt
index 3d2141b445c3..4d1f9b815fc4 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.he_normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.he_normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.he_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.HeNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.HeNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.VarianceScaling\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.he_uniform.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.he_uniform.pbtxt
index 5fa07a71315f..bf4296a74cf8 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.he_uniform.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.he_uniform.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.he_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.HeUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.HeUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.VarianceScaling\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.lecun_normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.lecun_normal.pbtxt
index e2a0ee1e5484..144c9f992e4c 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.lecun_normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.lecun_normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.lecun_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.LecunNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.LecunNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.VarianceScaling\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.lecun_uniform.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.lecun_uniform.pbtxt
index 070d2ff8be99..4f73d928118d 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.lecun_uniform.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.lecun_uniform.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.lecun_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.LecunUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.LecunUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.VarianceScaling\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.normal.pbtxt
index f1f9a7f0fba3..dc3bb2b8a734 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.random_normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.random_normal.pbtxt
index fc24a55cb9bb..985d4dd524b4 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.random_normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.random_normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.random_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.random_uniform.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.random_uniform.pbtxt
index 1d3fd5987996..caf51f1fd4a7 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.random_uniform.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.random_uniform.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.random_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.truncated_normal.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.truncated_normal.pbtxt
index 63232343dcd5..beaee23b8d61 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.truncated_normal.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.truncated_normal.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.truncated_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.TruncatedNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.TruncatedNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.initializers.uniform.pbtxt b/keras/api/golden/v1/tensorflow.keras.initializers.uniform.pbtxt
index ac43b6e992c1..f50e925b0a24 100644
--- a/keras/api/golden/v1/tensorflow.keras.initializers.uniform.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.initializers.uniform.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v1.RandomUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v1.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
   is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
   is_instance: "<type \'object\'>"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
index 5495727a3313..df293158bafc 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.AbstractRNNCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.AbstractRNNCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.AbstractRNNCell\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-activation.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-activation.pbtxt
index 610fe3840a9e..a6197fabe83f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-activation.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-activation.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Activation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Activation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Activation\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-activity-regularization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-activity-regularization.pbtxt
index c00349b14879..8b3b98d474d9 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-activity-regularization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-activity-regularization.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ActivityRegularization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.ActivityRegularization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.ActivityRegularization\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-add.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-add.pbtxt
index 2ec76e782122..1da66c96075e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-add.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-add.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Add"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Add\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Add\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-additive-attention.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-additive-attention.pbtxt
index b1780f501ed5..c92117a14857 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-additive-attention.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-additive-attention.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AdditiveAttention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.AdditiveAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.BaseDenseAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.dense_attention.AdditiveAttention\'>"
+  is_instance: "<class \'keras.layers.dense_attention.BaseDenseAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-alpha-dropout.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-alpha-dropout.pbtxt
index b70539648180..309844677980 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-alpha-dropout.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-alpha-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.AlphaDropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.AlphaDropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.AlphaDropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-attention.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-attention.pbtxt
index 9481cbc18f45..e746737b6cd0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-attention.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-attention.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Attention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.Attention\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.BaseDenseAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.dense_attention.Attention\'>"
+  is_instance: "<class \'keras.layers.dense_attention.BaseDenseAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling1-d.pbtxt
index 4fc49aa433a8..8fca0bdcd4c0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling2-d.pbtxt
index ec5df5c667af..dc3328059231 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling3-d.pbtxt
index 4e3d41ee5dde..f9b7ccedeaf7 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-average-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-average.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-average.pbtxt
index 2b092efb8337..73480f672425 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-average.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-average.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Average"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Average\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Average\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool1-d.pbtxt
index 81124e1682bf..d3da73fad951 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool2-d.pbtxt
index e861fda8107e..149b5c1f718c 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool3-d.pbtxt
index 161e0372d63b..9f8cacf4355b 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-avg-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-batch-normalization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-batch-normalization.pbtxt
index b3d992d5fdc6..81e38b00c6ec 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-batch-normalization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-batch-normalization.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.BatchNormalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.BatchNormalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.BatchNormalizationBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.normalization.BatchNormalization\'>"
+  is_instance: "<class \'keras.layers.normalization.BatchNormalizationBase\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-bidirectional.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-bidirectional.pbtxt
index 7e926162ade9..2fdd02d947a0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-bidirectional.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-bidirectional.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Bidirectional"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Bidirectional\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.Bidirectional\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-concatenate.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-concatenate.pbtxt
index e716c8c49214..3ad674e06703 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-concatenate.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-concatenate.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Concatenate"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Concatenate\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Concatenate\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
index 3c34852d7e6a..73c608fe7eba 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.ConvLSTM2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional_recurrent.ConvLSTM2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional_recurrent.ConvRNN2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional_recurrent.ConvLSTM2D\'>"
+  is_instance: "<class \'keras.layers.convolutional_recurrent.ConvRNN2D\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
index 8c4c827b92b1..03c58f282419 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv1DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d.pbtxt
index b503a8c75f69..bc3c8b851ca7 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
index 43e6f7f332ef..fe8566a777cf 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv2DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d.pbtxt
index 2a33509d196f..b72f33269f92 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
index 9a1fc4949e7f..ad4674f898db 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv3DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d.pbtxt
index d6c0ad0d151f..a26575cedc28 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-conv3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
index 66cdc51c355b..7c73e667445d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution1DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d.pbtxt
index 517f2505bdb2..031b9bef607d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
index a609dcdb55f1..f228d2285f55 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution2DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d.pbtxt
index 10adc4ce928a..5923c7e300a3 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
index ea0ee3028b3d..968f92e16fd3 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution3DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d.pbtxt
index 6e5d6bc942e4..3d0e64a40eae 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-convolution3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-cropping1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-cropping1-d.pbtxt
index c366341d8a4a..d3c0c4667510 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-cropping1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-cropping1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-cropping2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-cropping2-d.pbtxt
index ce86e9a44b4d..066ab2a5ebe0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-cropping2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-cropping2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-cropping3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-cropping3-d.pbtxt
index d46d79f30deb..429e27621232 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-cropping3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-cropping3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt
index e3a3e3d9be55..9c31c82ed96e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.CuDNNGRU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.cudnn_recurrent.CuDNNGRU\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.cudnn_recurrent._CuDNNRNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.cudnn_recurrent.CuDNNGRU\'>"
+  is_instance: "<class \'keras.layers.cudnn_recurrent._CuDNNRNN\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt
index 33d3999c0a05..d21a2f6e498a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.CuDNNLSTM"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.cudnn_recurrent.CuDNNLSTM\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.cudnn_recurrent._CuDNNRNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.cudnn_recurrent.CuDNNLSTM\'>"
+  is_instance: "<class \'keras.layers.cudnn_recurrent._CuDNNRNN\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-dense-features.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-dense-features.pbtxt
index 7dd3f40faaf5..e1c72f025d6f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-dense-features.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-dense-features.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.DenseFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.feature_column.dense_features.DenseFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.feature_column.dense_features.DenseFeatures\'>"
+  is_instance: "<class \'keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-dense.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-dense.pbtxt
index bc7ddcea718d..ba72f4688f21 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-dense.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-dense.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Dense"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dense\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Dense\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
index 891a5b201b28..a87b8c5caa5f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.DepthwiseConv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.DepthwiseConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.DepthwiseConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-dot.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-dot.pbtxt
index 5ba7cd1a3856..e0707b9f5216 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-dot.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-dot.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Dot"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Dot\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Dot\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-dropout.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-dropout.pbtxt
index 66045e97b8f1..f27e4fbd0e88 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-dropout.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Dropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-e-l-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-e-l-u.pbtxt
index 8ba42c66f06e..648d18008d5e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-e-l-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-e-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ELU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ELU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ELU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-embedding.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-embedding.pbtxt
index 5f5149dc5c2f..0a3c4d4580c9 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-embedding.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-embedding.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Embedding"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.embeddings.Embedding\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.embeddings.Embedding\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-flatten.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-flatten.pbtxt
index 8bdcee57fa24..caff18cbad22 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-flatten.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-flatten.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Flatten"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Flatten\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Flatten\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u-cell.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u-cell.pbtxt
index db3514efe739..44f6759f118c 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u-cell.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u-cell.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GRUCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.GRUCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.GRUCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u.pbtxt
index de7ba971a328..9af13223f500 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-g-r-u.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GRU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.GRU\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.GRU\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-dropout.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-dropout.pbtxt
index 6273d7986a4a..db3eef7b4c02 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-dropout.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.GaussianDropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.GaussianDropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.GaussianDropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-noise.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-noise.pbtxt
index e6debc89415c..751694fa8388 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-noise.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-gaussian-noise.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.GaussianNoise"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.GaussianNoise\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.GaussianNoise\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
index 08c9a1001619..8d5ae77c81d0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
index d6e3f1252cb0..0a2e2c477c96 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
index 94e9a96b88f1..de839684f401 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
index 00afd5fc9670..8cc77cdbc5d7 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
index 18d826fdd135..f2419b09090f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
index 92e8876f5c48..5eabc02b4a1a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
index f9b8b1778f41..a43af7a0978a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
index 4bfcac30602c..511b6099ef56 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
index 0762ac1e7677..b5e6918495e0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
index 69ff605469c8..c8186456e84f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
index e05fb04f0b2a..dd375091238b 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
index 1268fbf60b09..6dbb191272cf 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-input-layer.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-input-layer.pbtxt
index 7ce532a54c63..90456d5e85b4 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-input-layer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-input-layer.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.InputLayer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.input_layer.InputLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.input_layer.InputLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-input-spec.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-input-spec.pbtxt
index c95e3135df88..6f146e09d02e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-input-spec.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-input-spec.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.layers.InputSpec"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.input_spec.InputSpec\'>"
+  is_instance: "<class \'keras.engine.input_spec.InputSpec\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
index 639efba7a75c..639839e354f5 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.LSTMCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m.pbtxt
index a1536d0b82e7..095bf4e2d8bb 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-l-s-t-m.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.LSTM"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTM\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTM\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-lambda.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-lambda.pbtxt
index 211c366d9eae..34f3fd474b47 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-lambda.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-lambda.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Lambda"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Lambda\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Lambda\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-layer-normalization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-layer-normalization.pbtxt
index 916abe73f30b..b73a667bb366 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-layer-normalization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-layer-normalization.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LayerNormalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.LayerNormalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.normalization.LayerNormalization\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-layer.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-layer.pbtxt
index 2c4f6df71502..3a38cec1ee82 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-layer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-layer.pbtxt
@@ -1,10 +1,10 @@
 path: "tensorflow.keras.layers.Layer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-leaky-re-l-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
index 3bd0b6a60717..4d0375f6bcc5 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LeakyReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.LeakyReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.LeakyReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected1-d.pbtxt
index 0d178d92f065..cdfa489c8005 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LocallyConnected1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.local.LocallyConnected1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.local.LocallyConnected1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected2-d.pbtxt
index da65b2627074..f8c723fa28cb 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-locally-connected2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LocallyConnected2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.local.LocallyConnected2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.local.LocallyConnected2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-masking.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-masking.pbtxt
index 8dcd821c0e1c..26f432211af1 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-masking.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-masking.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Masking"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Masking\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Masking\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool1-d.pbtxt
index cce7e92fde3f..01acf33e04f0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool2-d.pbtxt
index 390cb52e228e..36ef7679f5b9 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool3-d.pbtxt
index 4c2ddc2ce123..6ac8af3280d7 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pool3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling1-d.pbtxt
index e7956c1029f6..483fa36affb7 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling2-d.pbtxt
index 014af0a3b63e..9014c0f4b77c 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling3-d.pbtxt
index 7c1a8e8820eb..3fa263430a5a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-max-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-maximum.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-maximum.pbtxt
index 52286c20c584..155093c4c456 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-maximum.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-maximum.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Maximum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Maximum\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Maximum\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-minimum.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-minimum.pbtxt
index 3ae00343db37..d1a50c505d48 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-minimum.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-minimum.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Minimum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Minimum\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Minimum\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-multi-head-attention.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-multi-head-attention.pbtxt
index 001a8743a914..26d3457fd92f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-multi-head-attention.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-multi-head-attention.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.MultiHeadAttention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.multi_head_attention.MultiHeadAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.multi_head_attention.MultiHeadAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-multiply.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-multiply.pbtxt
index 1b9ec5357feb..f1af7f6dc84d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-multiply.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-multiply.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Multiply"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Multiply\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Multiply\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-p-re-l-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-p-re-l-u.pbtxt
index 6b26c702b125..edfd6f3b5da8 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-p-re-l-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-p-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.PReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.PReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.PReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-permute.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-permute.pbtxt
index c79315618a46..d9679573fb52 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-permute.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-permute.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Permute"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Permute\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Permute\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-r-n-n.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-r-n-n.pbtxt
index c09439b70280..1546d9a16254 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-r-n-n.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-r-n-n.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.RNN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-re-l-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-re-l-u.pbtxt
index 4d9f2c18b80c..b90c5c3a310d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-re-l-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-repeat-vector.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-repeat-vector.pbtxt
index a9ab889dd55e..a54a4b0d0926 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-repeat-vector.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-repeat-vector.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.RepeatVector"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.RepeatVector\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.RepeatVector\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-reshape.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-reshape.pbtxt
index 4ac4c4fe8f6f..cdeb443e8032 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-reshape.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-reshape.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Reshape"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Reshape\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Reshape\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv1-d.pbtxt
index 664b4ec2547c..9067707a2e9d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv1-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConv1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv2-d.pbtxt
index 6ab78380d990..09ec7bc1aa19 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-separable-conv2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
index 5e5aff38b199..24deb6cb3315 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConvolution1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
index 7560106c96e1..48d439d015e6 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConvolution2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
index 4b9153429225..427cd60bd20e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SimpleRNNCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.SimpleRNNCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.SimpleRNNCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n.pbtxt
index f5b25907cc67..ee61e8e4b5ff 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-simple-r-n-n.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SimpleRNN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.SimpleRNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.SimpleRNN\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-softmax.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-softmax.pbtxt
index aebd00c9d980..1dad1e370b6b 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-softmax.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-softmax.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Softmax"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.Softmax\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.Softmax\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
index 415259bfbcf3..a257707b8773 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout1D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
index 59c314862784..b544a432e46c 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout2D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
index 760e6592808f..d1e590185fad 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout3D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
index bd454ac60ec9..bc11b43eb1d6 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.StackedRNNCells"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.StackedRNNCells\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.StackedRNNCells\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-subtract.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-subtract.pbtxt
index e9c00b514155..b39738f2bf03 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-subtract.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-subtract.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Subtract"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Subtract\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Subtract\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
index 407c860c0333..b82f225781c8 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ThresholdedReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ThresholdedReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ThresholdedReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-time-distributed.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-time-distributed.pbtxt
index d0f7619d1bf0..6ae331372f00 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-time-distributed.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-time-distributed.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.TimeDistributed"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.TimeDistributed\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.TimeDistributed\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling1-d.pbtxt
index 7561273844e8..9594f4d05136 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling2-d.pbtxt
index 428f43d7523e..5a8cee9a6a4f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling3-d.pbtxt
index 482ecf32e2a8..fb0b7eb3e1a4 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-up-sampling3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-wrapper.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-wrapper.pbtxt
index 8732026d388b..bc0dde399718 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-wrapper.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-wrapper.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Wrapper"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding1-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding1-d.pbtxt
index 2312af6ebacc..de912ff7dae1 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding1-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding2-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding2-d.pbtxt
index 8937e9de579a..79116bf4319e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding2-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding3-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding3-d.pbtxt
index 795ad24a3ac9..f46bb3fff9dc 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding3-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.-zero-padding3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
index 0242b10c649b..ea13f53e4ba0 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.EinsumDense"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.einsum_dense.EinsumDense\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.einsum_dense.EinsumDense\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
index 425c5e459341..6cb7a2fb8abe 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.RandomFourierFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.kernelized.RandomFourierFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.kernelized.RandomFourierFeatures\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
index e66d46d4260b..59f1a8644d77 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CategoryCrossing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.category_crossing.CategoryCrossing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.category_crossing.CategoryCrossing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
index de99a1671fd7..40e8ab0012ec 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CategoryEncoding"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.category_encoding.CategoryEncoding\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.category_encoding.CategoryEncoding\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
index 87cea69230c4..234263a3c53d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CenterCrop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.CenterCrop\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.CenterCrop\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
index 2f75c151d66f..cc23668ff93b 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Discretization.DiscretizingCombiner"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.discretization.Discretization.DiscretizingCombiner\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.Combiner\'>"
+  is_instance: "<class \'keras.layers.preprocessing.discretization.Discretization.DiscretizingCombiner\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.Combiner\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
index 8042ef88f6bc..794a5bd0fe1f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Discretization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.discretization.Discretization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.discretization.Discretization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "DiscretizingCombiner"
@@ -143,7 +143,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'bin_boundaries\', \'num_bins\', \'epsilon\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'0.01\'], "
+    argspec: "args=[\'self\', \'bins\', \'epsilon\'], varargs=None, keywords=kwargs, defaults=[\'0.01\'], "
   }
   member_method {
     name: "adapt"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
index ac173d6cbe6a..818f266bac44 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Hashing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.hashing.Hashing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.hashing.Hashing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
index 14a13523606a..0dd1c56ffe2e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
@@ -1,17 +1,17 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.IntegerLookup"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.integer_lookup_v1.IntegerLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.integer_lookup.IntegerLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup_v1.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.integer_lookup_v1.IntegerLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.integer_lookup.IntegerLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup_v1.IndexLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup.IndexLookup\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
index 37b5255598ed..5ceb77903901 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Normalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.normalization_v1.Normalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.normalization_v1.Normalization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
index f5ad8914df65..d161e2fae127 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.PreprocessingLayer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
index 581f53d21632..a70f83d04331 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomContrast"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomContrast\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomContrast\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
index 82fc1918b351..e65f8a90e03b 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomCrop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomCrop\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomCrop\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
index 8219f5b21717..c0902fcb6011 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomFlip"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomFlip\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomFlip\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
index 76c813930d4c..0b8f9389015a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomHeight"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomHeight\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomHeight\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
index 3fce39b8c4f7..4b1d2de5a3f4 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomRotation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomRotation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomRotation\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
index 560c4caef3d2..7685d8012c6f 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomTranslation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomTranslation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomTranslation\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
index 8ba03b5ec5d3..006d0521d573 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomWidth"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomWidth\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomWidth\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
index 13acf89033ce..e48a8801cf3d 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomZoom"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomZoom\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomZoom\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
index 3fa626ff3487..62afc26c248c 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Rescaling"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.Rescaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.Rescaling\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
index 467b28635646..878cadbc9e4e 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Resizing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.Resizing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.Resizing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
index 0cfbb85b8f9a..854929417650 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
@@ -1,17 +1,17 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.StringLookup"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.string_lookup_v1.StringLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.string_lookup.StringLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup_v1.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.string_lookup_v1.StringLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.string_lookup.StringLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup_v1.IndexLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup.IndexLookup\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
index 5f75e8cf613a..5b13e7ac1c6a 100644
--- a/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.TextVectorization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.text_vectorization_v1.TextVectorization\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.text_vectorization.TextVectorization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.text_vectorization_v1.TextVectorization\'>"
+  is_instance: "<class \'keras.layers.preprocessing.text_vectorization.TextVectorization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer_v1.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
@@ -141,7 +141,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'max_tokens\', \'standardize\', \'split\', \'ngrams\', \'output_mode\', \'output_sequence_length\', \'pad_to_max_tokens\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'lower_and_strip_punctuation\', \'whitespace\', \'None\', \'int\', \'None\', \'False\'], "
+    argspec: "args=[\'self\', \'max_tokens\', \'standardize\', \'split\', \'ngrams\', \'output_mode\', \'output_sequence_length\', \'pad_to_max_tokens\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'lower_and_strip_punctuation\', \'whitespace\', \'None\', \'int\', \'None\', \'True\'], "
   }
   member_method {
     name: "adapt"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-binary-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-binary-crossentropy.pbtxt
index 9ccd6bb75811..28c121028418 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-binary-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-binary-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.BinaryCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.BinaryCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.BinaryCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-categorical-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
index 919bedcc2cde..df4ca0c38ca3 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-categorical-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-categorical-hinge.pbtxt
index d298a550c34f..fc23af9c5b75 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-categorical-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-categorical-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CategoricalHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CategoricalHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CategoricalHinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-cosine-similarity.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-cosine-similarity.pbtxt
index 661375b89178..7bd4ab61c50b 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-cosine-similarity.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-cosine-similarity.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CosineSimilarity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CosineSimilarity\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CosineSimilarity\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-hinge.pbtxt
index 7ad839d86c21..a154c2a2964b 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Hinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Hinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Hinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-huber.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-huber.pbtxt
index 678c57eb7a3d..b9da506b5ce8 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-huber.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-huber.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Huber"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Huber\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Huber\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-k-l-divergence.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-k-l-divergence.pbtxt
index b15ba6f2d6d1..b16a275a9191 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-k-l-divergence.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-k-l-divergence.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.KLDivergence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.KLDivergence\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.KLDivergence\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-log-cosh.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-log-cosh.pbtxt
index 1bdc6751a4a3..97253a93e3cd 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-log-cosh.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-log-cosh.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.LogCosh"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.LogCosh\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.LogCosh\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-loss.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-loss.pbtxt
index 54316ffdee1a..f6e062b14609 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-loss.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-loss.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.losses.Loss"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-error.pbtxt
index 711ca17e4ab5..91dab6787d8a 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanAbsoluteError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanAbsoluteError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanAbsoluteError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
index cb4e2aea0c23..f4c1b5cf0220 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanAbsolutePercentageError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanAbsolutePercentageError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanAbsolutePercentageError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-error.pbtxt
index e9a3a4d8dde1..815bddaf39b4 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanSquaredError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
index 572a10653d9b..d08388055fdf 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanSquaredLogarithmicError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanSquaredLogarithmicError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanSquaredLogarithmicError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-poisson.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-poisson.pbtxt
index 86cf81207d5b..5313398aad17 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-poisson.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-poisson.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Poisson"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Poisson\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Poisson\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
index 58ace3fcd0c2..06d9cfe145ee 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.SparseCategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.SparseCategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.SparseCategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.losses.-squared-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.losses.-squared-hinge.pbtxt
index 453e321a4bd6..3f2cf2c5b131 100644
--- a/keras/api/golden/v1/tensorflow.keras.losses.-squared-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.losses.-squared-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.SquaredHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.SquaredHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.SquaredHinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-a-u-c.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-a-u-c.pbtxt
index 3fb5b4802138..fcb4b2792972 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-a-u-c.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-a-u-c.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.AUC"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.AUC\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.AUC\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-accuracy.pbtxt
index 4c548fb34a7e..a778890c498c 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Accuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Accuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Accuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-binary-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-binary-accuracy.pbtxt
index e0f164e12f3b..35bb7dc5d73f 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-binary-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-binary-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.BinaryAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.BinaryAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.BinaryAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-binary-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
index 08c3c76f2d1f..c97015ff2935 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.BinaryCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.BinaryCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.BinaryCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
index 8a2483ec4905..90cb6e472cf6 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
index f946beea9b77..1295bed96521 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-hinge.pbtxt
index 98e2638ffa0e..97dfe2c6afb8 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-categorical-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalHinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-cosine-similarity.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-cosine-similarity.pbtxt
index 31ec822f275c..fc09955d25b0 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-cosine-similarity.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-cosine-similarity.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CosineSimilarity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CosineSimilarity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CosineSimilarity\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-false-negatives.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-false-negatives.pbtxt
index 27e12f944214..51eae0e38eca 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-false-negatives.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-false-negatives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.FalseNegatives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.FalseNegatives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.FalseNegatives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-false-positives.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-false-positives.pbtxt
index 0aadcd5e74f1..9c75d95a04b5 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-false-positives.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-false-positives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.FalsePositives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.FalsePositives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.FalsePositives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-hinge.pbtxt
index 3dd48b8fd9b2..2d9d51fe7913 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Hinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Hinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Hinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-k-l-divergence.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-k-l-divergence.pbtxt
index 15be4cf90ae7..58821f18b49f 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-k-l-divergence.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-k-l-divergence.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.KLDivergence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.KLDivergence\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.KLDivergence\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-log-cosh-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-log-cosh-error.pbtxt
index e95062e5f618..1a237253fb8e 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-log-cosh-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-log-cosh-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.LogCoshError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.LogCoshError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.LogCoshError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
index 5ba92082c3c1..4b6f7cec441b 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanAbsoluteError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanAbsoluteError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanAbsoluteError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
index 9db66d3830c2..f10e46b74351 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanAbsolutePercentageError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanAbsolutePercentageError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanAbsolutePercentageError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-io-u.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-io-u.pbtxt
index 72b5c56fb123..08c8202a23e7 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-io-u.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-io-u.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.MeanIoU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanIoU\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanIoU\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-relative-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-relative-error.pbtxt
index 2f903b5fe7d7..088074b9f095 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-relative-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-relative-error.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.metrics.MeanRelativeError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanRelativeError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanRelativeError\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-error.pbtxt
index accbfc7b1d51..b818fc5c0e98 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanSquaredError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
index 43c7fe0f9136..2f27f9453d1b 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanSquaredLogarithmicError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanSquaredLogarithmicError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanSquaredLogarithmicError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-tensor.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-tensor.pbtxt
index e401e07ac24d..42a8b9542e66 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean-tensor.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean-tensor.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.MeanTensor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanTensor\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanTensor\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-mean.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-mean.pbtxt
index 5e841b719ac2..d22f32a247cd 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-mean.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-mean.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.Mean"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-metric.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-metric.pbtxt
index 49ab2c287d07..524ba9e1292d 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-metric.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-metric.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.metrics.Metric"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-poisson.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-poisson.pbtxt
index 4642d904d701..1a80b71b9451 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-poisson.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-poisson.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Poisson"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Poisson\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Poisson\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-precision-at-recall.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-precision-at-recall.pbtxt
index d90685ac3dc8..bf113a9cc70a 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-precision-at-recall.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-precision-at-recall.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.PrecisionAtRecall"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.PrecisionAtRecall\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.PrecisionAtRecall\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-precision.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-precision.pbtxt
index c06b5215e0f5..50cc787db95d 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-precision.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-precision.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.Precision"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Precision\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Precision\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-recall-at-precision.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-recall-at-precision.pbtxt
index 724e66ccb04e..d87c551436d7 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-recall-at-precision.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-recall-at-precision.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.RecallAtPrecision"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.RecallAtPrecision\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.RecallAtPrecision\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-recall.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-recall.pbtxt
index 5ff74c9b1714..6cee679c2ae4 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-recall.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-recall.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.Recall"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Recall\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Recall\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
index e9e4941e6ead..d9f3ffa950fc 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.metrics.RootMeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.RootMeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.RootMeanSquaredError\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
index c9eaa6c42a55..1698d9d7f946 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.SensitivityAtSpecificity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivityAtSpecificity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SensitivityAtSpecificity\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
index 9f758618f433..f6dfa927150c 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
index 8d3426a894af..c9c1604757f7 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseCategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseCategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseCategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
index a2af5ece179a..0cff6b69654f 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseTopKCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseTopKCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseTopKCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
index 3100ede89167..984a5381adb4 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.SpecificityAtSensitivity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SpecificityAtSensitivity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SpecificityAtSensitivity\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-squared-hinge.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-squared-hinge.pbtxt
index 9c46c7b65360..10a039b91967 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-squared-hinge.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-squared-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SquaredHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SquaredHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SquaredHinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-sum.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-sum.pbtxt
index 6a73fe957d6c..87679573a3ac 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-sum.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-sum.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.Sum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Sum\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Sum\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
index fdfa0285ffe5..882a29027b2f 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.TopKCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TopKCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TopKCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-true-negatives.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-true-negatives.pbtxt
index 39a06287507f..9c55c1dd98c6 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-true-negatives.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-true-negatives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.TrueNegatives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TrueNegatives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TrueNegatives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.metrics.-true-positives.pbtxt b/keras/api/golden/v1/tensorflow.keras.metrics.-true-positives.pbtxt
index f5c09b68593d..a302860d3e46 100644
--- a/keras/api/golden/v1/tensorflow.keras.metrics.-true-positives.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.metrics.-true-positives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.TruePositives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TruePositives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TruePositives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt b/keras/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
index 3bea3a9f8fed..d9215a74cf85 100644
--- a/keras/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.mixed_precision.LossScaleOptimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt b/keras/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
index a68c17e8f247..0c4bb68fe640 100644
--- a/keras/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
@@ -1,9 +1,9 @@
 path: "tensorflow.keras.mixed_precision.experimental.LossScaleOptimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizerV1\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizerV1\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.models.-model.pbtxt b/keras/api/golden/v1/tensorflow.keras.models.-model.pbtxt
index 0c837d030c35..8bbaf3505d96 100644
--- a/keras/api/golden/v1/tensorflow.keras.models.-model.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.models.-model.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.models.Model"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.models.-sequential.pbtxt b/keras/api/golden/v1/tensorflow.keras.models.-sequential.pbtxt
index 4a595abe9dbe..2f19e5ef277d 100644
--- a/keras/api/golden/v1/tensorflow.keras.models.-sequential.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.models.-sequential.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.models.Sequential"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.sequential.Sequential\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.functional.Functional\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.sequential.Sequential\'>"
+  is_instance: "<class \'keras.engine.functional.Functional\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-adadelta.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-adadelta.pbtxt
index 0a297df71a98..1bc3f05395d4 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-adadelta.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-adadelta.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adadelta"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adadelta.Adadelta\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adadelta.Adadelta\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-adagrad.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-adagrad.pbtxt
index 1ec4e30e3f26..e19692ef7b5c 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-adagrad.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-adagrad.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adagrad"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adagrad.Adagrad\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adagrad.Adagrad\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-adam.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-adam.pbtxt
index a6deef2da307..5554eca222df 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-adam.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-adam.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adam"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adam.Adam\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adam.Adam\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-adamax.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-adamax.pbtxt
index ccb9bebb1953..60b8e121478e 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-adamax.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-adamax.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adamax"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adamax.Adamax\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adamax.Adamax\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-ftrl.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-ftrl.pbtxt
index eab98ac6d06c..0dded428bf6a 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-ftrl.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-ftrl.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Ftrl"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.ftrl.Ftrl\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.ftrl.Ftrl\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-nadam.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-nadam.pbtxt
index 81cce2fbbecc..522e1212fee7 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-nadam.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-nadam.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Nadam"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.nadam.Nadam\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.nadam.Nadam\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-optimizer.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-optimizer.pbtxt
index badb430ca1f0..20cf1c540492 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-optimizer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-optimizer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.optimizers.Optimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-r-m-sprop.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
index bcc8c6019db2..ee6beafeb20c 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.RMSprop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.rmsprop.RMSprop\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.rmsprop.RMSprop\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.-s-g-d.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.-s-g-d.pbtxt
index db673eedc118..fe635912d61a 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.-s-g-d.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.-s-g-d.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.SGD"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.gradient_descent.SGD\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.gradient_descent.SGD\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
index 41a5cbfe11c1..965bea136d6f 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.CosineDecayRestarts"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
index 299ff85e8135..cd3a0a876d63 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.CosineDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
index 25ae478cb2c6..e0d4bbaceaab 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.ExponentialDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.ExponentialDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.ExponentialDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
index b2fe61f4d2cb..a4bd93e25856 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.InverseTimeDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.InverseTimeDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.InverseTimeDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
index 3b33bd7526bd..b1962e9d64fd 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.optimizers.schedules.LearningRateSchedule"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
index 6f1496492abf..58b1504bd08e 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.PiecewiseConstantDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.PiecewiseConstantDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.PiecewiseConstantDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
index 728436c36111..f610501d46cf 100644
--- a/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.PolynomialDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.PolynomialDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.PolynomialDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
index e1ed382d754c..1cf45d07ff46 100644
--- a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.preprocessing.image.DirectoryIterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.DirectoryIterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.DirectoryIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.directory_iterator.DirectoryIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.BatchFromFilesMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "allowed_class_modes"
diff --git a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
index 4e51b0907704..a7a29fe3d3b4 100644
--- a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.preprocessing.image.ImageDataGenerator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.ImageDataGenerator\'>"
+  is_instance: "<class \'keras.preprocessing.image.ImageDataGenerator\'>"
   is_instance: "<class \'keras_preprocessing.image.image_data_generator.ImageDataGenerator\'>"
   is_instance: "<type \'object\'>"
   member_method {
diff --git a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-iterator.pbtxt b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-iterator.pbtxt
index 089d12f205f2..404906548be3 100644
--- a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-iterator.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-iterator.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.preprocessing.image.Iterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "white_list_formats"
diff --git a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
index 8f3f71d84cda..3bd0a00bd31f 100644
--- a/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
@@ -1,10 +1,10 @@
 path: "tensorflow.keras.preprocessing.image.NumpyArrayIterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.NumpyArrayIterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.NumpyArrayIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.numpy_array_iterator.NumpyArrayIterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "white_list_formats"
diff --git a/keras/api/golden/v1/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt b/keras/api/golden/v1/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
index 878c6392f74a..6a4f9efdc499 100644
--- a/keras/api/golden/v1/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.preprocessing.sequence.TimeseriesGenerator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.sequence.TimeseriesGenerator\'>"
+  is_instance: "<class \'keras.preprocessing.sequence.TimeseriesGenerator\'>"
   is_instance: "<class \'keras_preprocessing.sequence.TimeseriesGenerator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.-l1-l2.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.-l1-l2.pbtxt
index a45fb7b55e58..b704de99ca07 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.-l1-l2.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.-l1-l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L1L2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.-l1.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.-l1.pbtxt
index 5cb133ca85dd..31d5659bd0fb 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.-l1.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.-l1.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L1"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.-l2.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.-l2.pbtxt
index c5b706d1d2fb..5253aec0fd38 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.-l2.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.-l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.-regularizer.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.-regularizer.pbtxt
index d9058a0becdc..4a7bbb34f532 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.-regularizer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.-regularizer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.regularizers.Regularizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.l1.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.l1.pbtxt
index eb769a0dc44d..b3c5b3dfdc00 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.l1.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.l1.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.l1"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.regularizers.l2.pbtxt b/keras/api/golden/v1/tensorflow.keras.regularizers.l2.pbtxt
index fda5c76ecd23..4db49bd4449d 100644
--- a/keras/api/golden/v1/tensorflow.keras.regularizers.l2.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.regularizers.l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.l2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-custom-object-scope.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-custom-object-scope.pbtxt
index 109682046b99..9e9370be68f8 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-custom-object-scope.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-custom-object-scope.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.CustomObjectScope"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.CustomObjectScope\'>"
+  is_instance: "<class \'keras.utils.generic_utils.CustomObjectScope\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-generator-enqueuer.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-generator-enqueuer.pbtxt
index c253afe559a7..ac1c5387bc18 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-generator-enqueuer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-generator-enqueuer.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.utils.GeneratorEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.GeneratorEnqueuer\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.GeneratorEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-ordered-enqueuer.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
index e7e7d2839b26..9cd4b730b325 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.utils.OrderedEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.OrderedEnqueuer\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.OrderedEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-progbar.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-progbar.pbtxt
index d78825835152..a1b31c0389aa 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-progbar.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-progbar.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.Progbar"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.Progbar\'>"
+  is_instance: "<class \'keras.utils.generic_utils.Progbar\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-sequence-enqueuer.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
index aa36d66f9215..eb3bbc5b897f 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.SequenceEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.-sequence.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.-sequence.pbtxt
index e2dc932dc86d..43e0717ccaae 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.-sequence.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.-sequence.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.Sequence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.utils.custom_object_scope.pbtxt b/keras/api/golden/v1/tensorflow.keras.utils.custom_object_scope.pbtxt
index bfee151ae284..4fa8c7af04e4 100644
--- a/keras/api/golden/v1/tensorflow.keras.utils.custom_object_scope.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.utils.custom_object_scope.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.custom_object_scope"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.CustomObjectScope\'>"
+  is_instance: "<class \'keras.utils.generic_utils.CustomObjectScope\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt b/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
index 67cca3af41db..180e05527f31 100644
--- a/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.wrappers.scikit_learn.KerasClassifier"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.KerasClassifier\'>"
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.BaseWrapper\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.KerasClassifier\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.BaseWrapper\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt b/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
index f4b9b7e277ec..0dfc03fb05e5 100644
--- a/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
+++ b/keras/api/golden/v1/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.wrappers.scikit_learn.KerasRegressor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.KerasRegressor\'>"
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.BaseWrapper\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.KerasRegressor\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.BaseWrapper\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.-model.pbtxt b/keras/api/golden/v2/tensorflow.keras.-model.pbtxt
index 41ab38df9853..c387e1c45830 100644
--- a/keras/api/golden/v2/tensorflow.keras.-model.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.-model.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.Model"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.-sequential.pbtxt b/keras/api/golden/v2/tensorflow.keras.-sequential.pbtxt
index 48495e4ed13a..6a74bcde08bb 100644
--- a/keras/api/golden/v2/tensorflow.keras.-sequential.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.-sequential.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.Sequential"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.sequential.Sequential\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.functional.Functional\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.sequential.Sequential\'>"
+  is_instance: "<class \'keras.engine.functional.Functional\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-base-logger.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-base-logger.pbtxt
index 9dbdaf0f5f3d..3a8597db7bfd 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-base-logger.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-base-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.BaseLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.BaseLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.BaseLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
index 0725f606e292..fbeada72976d 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.CSVLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.CSVLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.CSVLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-callback-list.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-callback-list.pbtxt
index ddf772c811d4..3835ea4c944a 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-callback-list.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-callback-list.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.callbacks.CallbackList"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.CallbackList\'>"
+  is_instance: "<class \'keras.callbacks.CallbackList\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-callback.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-callback.pbtxt
index 14bfc3bedbfb..faa4541b7094 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-callback.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-callback.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.callbacks.Callback"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-early-stopping.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-early-stopping.pbtxt
index 9812bad8f66f..75512300c8ab 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-early-stopping.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-early-stopping.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.EarlyStopping"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.EarlyStopping\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.EarlyStopping\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-history.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-history.pbtxt
index 5aa739391ef8..379a9f3aa1d5 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-history.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-history.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.History"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.History\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.History\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-lambda-callback.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-lambda-callback.pbtxt
index bf5bcb68df47..61c47980e736 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-lambda-callback.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-lambda-callback.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.LambdaCallback"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.LambdaCallback\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.LambdaCallback\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
index a04ffb92eb9e..02a8faf671e5 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.LearningRateScheduler"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.LearningRateScheduler\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.LearningRateScheduler\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-model-checkpoint.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
index e6cc7aee5a80..6a1825993a30 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-model-checkpoint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ModelCheckpoint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ModelCheckpoint\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ModelCheckpoint\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-progbar-logger.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-progbar-logger.pbtxt
index 624f856d2752..e8f92604bb22 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-progbar-logger.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-progbar-logger.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ProgbarLogger"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ProgbarLogger\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ProgbarLogger\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
index 0fed6fd23670..a7792b964315 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.ReduceLROnPlateau"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.ReduceLROnPlateau\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.ReduceLROnPlateau\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-remote-monitor.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-remote-monitor.pbtxt
index 71cf7f4a4922..98552f19de49 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-remote-monitor.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-remote-monitor.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.RemoteMonitor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.RemoteMonitor\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.RemoteMonitor\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-tensor-board.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-tensor-board.pbtxt
index f0e3c045cc1a..efe8d0855682 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-tensor-board.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-tensor-board.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.callbacks.TensorBoard"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.TensorBoard\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.TensorBoardVersionSelector\'>"
+  is_instance: "<class \'keras.callbacks.TensorBoard\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.utils.version_utils.TensorBoardVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
index d5a59d870a39..62ccd1ec26b4 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.TerminateOnNaN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.TerminateOnNaN\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.TerminateOnNaN\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.callbacks.experimental.-backup-and-restore.pbtxt b/keras/api/golden/v2/tensorflow.keras.callbacks.experimental.-backup-and-restore.pbtxt
index 4b0ab2536ae4..32e3a9f14ca6 100644
--- a/keras/api/golden/v2/tensorflow.keras.callbacks.experimental.-backup-and-restore.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.callbacks.experimental.-backup-and-restore.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.callbacks.experimental.BackupAndRestore"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.callbacks.BackupAndRestore\'>"
-  is_instance: "<class \'tensorflow.python.keras.callbacks.Callback\'>"
+  is_instance: "<class \'keras.callbacks.BackupAndRestore\'>"
+  is_instance: "<class \'keras.callbacks.Callback\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-constraint.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-constraint.pbtxt
index 8e07b7d98e1d..b13e4c558f14 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-constraint.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-constraint.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.constraints.Constraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-max-norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-max-norm.pbtxt
index 2b81174b6cd4..b96e2fdc7649 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-max-norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-max-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.MaxNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-min-max-norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-min-max-norm.pbtxt
index a41eda86ac25..85017a5ab9fa 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-min-max-norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-min-max-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.MinMaxNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MinMaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MinMaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-non-neg.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-non-neg.pbtxt
index 572e3eea4d98..278f33d15b82 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-non-neg.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-non-neg.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.NonNeg"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.NonNeg\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.NonNeg\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-radial-constraint.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-radial-constraint.pbtxt
index 826cfb929320..9fa92b2ccc62 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-radial-constraint.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-radial-constraint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.RadialConstraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.RadialConstraint\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.RadialConstraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.-unit-norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.-unit-norm.pbtxt
index fe16c38cc83f..a8ebd4eb371b 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.-unit-norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.-unit-norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.UnitNorm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.UnitNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.UnitNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.max_norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.max_norm.pbtxt
index 6650bae07a0d..bc201d9df1fb 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.max_norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.max_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.max_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.min_max_norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.min_max_norm.pbtxt
index 9dd3bc92fc4f..e260340d0c25 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.min_max_norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.min_max_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.min_max_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.MinMaxNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.MinMaxNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.non_neg.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.non_neg.pbtxt
index a565840939f9..4f8c1d767db8 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.non_neg.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.non_neg.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.non_neg"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.NonNeg\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.NonNeg\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.radial_constraint.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.radial_constraint.pbtxt
index 3040111b3249..8dca693a318b 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.radial_constraint.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.radial_constraint.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.radial_constraint"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.RadialConstraint\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.RadialConstraint\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.constraints.unit_norm.pbtxt b/keras/api/golden/v2/tensorflow.keras.constraints.unit_norm.pbtxt
index 5cbe0da4c1d1..1aa9da9db057 100644
--- a/keras/api/golden/v2/tensorflow.keras.constraints.unit_norm.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.constraints.unit_norm.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.constraints.unit_norm"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.constraints.UnitNorm\'>"
-  is_instance: "<class \'tensorflow.python.keras.constraints.Constraint\'>"
+  is_instance: "<class \'keras.constraints.UnitNorm\'>"
+  is_instance: "<class \'keras.constraints.Constraint\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
index 58bede556dfd..ada37ff3c675 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay-restarts.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.experimental.CosineDecayRestarts"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay.pbtxt
index e2549a2ac627..56f6dc0f9395 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-cosine-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.experimental.CosineDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-linear-model.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-linear-model.pbtxt
index 1a23072830bf..161083818646 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-linear-model.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-linear-model.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.LinearModel"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.premade.linear.LinearModel\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.premade.linear.LinearModel\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
index 93dd8fa99720..72953eda885b 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-peephole-l-s-t-m-cell.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.PeepholeLSTMCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.PeepholeLSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.PeepholeLSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-sequence-features.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-sequence-features.pbtxt
index 97f2e75199af..d82d683f12d5 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-sequence-features.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-sequence-features.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.experimental.SequenceFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.feature_column.sequence_feature_column.SequenceFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.feature_column.sequence_feature_column.SequenceFeatures\'>"
+  is_instance: "<class \'keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.experimental.-wide-deep-model.pbtxt b/keras/api/golden/v2/tensorflow.keras.experimental.-wide-deep-model.pbtxt
index 3e5cee9e5749..9579dec7e2e0 100644
--- a/keras/api/golden/v2/tensorflow.keras.experimental.-wide-deep-model.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.experimental.-wide-deep-model.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.experimental.WideDeepModel"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.premade.wide_deep.WideDeepModel\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.premade.wide_deep.WideDeepModel\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-constant.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-constant.pbtxt
index 68135c36c92b..cd56d7c7027b 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-constant.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-constant.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.Constant"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Constant\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Constant\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-normal.pbtxt
index d332e0b00f6f..7a4f2f695b19 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.GlorotNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.GlorotNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.GlorotNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-uniform.pbtxt
index 10afe978052d..39e8dceebd21 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-glorot-uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.GlorotUniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.GlorotUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.GlorotUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-he-normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-he-normal.pbtxt
index d59d94aa85f8..e2392a1de059 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-he-normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-he-normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.HeNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.HeNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.HeNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-he-uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-he-uniform.pbtxt
index ac1e5fc12f6b..a1d0b78df694 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-he-uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-he-uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.HeUniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.HeUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.HeUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-identity.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-identity.pbtxt
index 0e763b5ded35..bdf11c0d346b 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-identity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-identity.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.Identity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Identity\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Identity\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-initializer.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-initializer.pbtxt
index 74597c8c7cf4..bbbf17dcface 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-initializer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-initializer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.initializers.Initializer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-normal.pbtxt
index 00960450ed9e..4dc8579c6726 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.LecunNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.LecunNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.LecunNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-uniform.pbtxt
index 7ef39b5c19fc..1cf25acc880c 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-lecun-uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.LecunUniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.LecunUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.LecunUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-ones.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-ones.pbtxt
index be1e9bc59f58..949254b493fe 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-ones.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-ones.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.Ones"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Ones\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Ones\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-orthogonal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-orthogonal.pbtxt
index 4e50862d96c3..7cf7a32a86c8 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-orthogonal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-orthogonal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.Orthogonal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Orthogonal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Orthogonal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-random-normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-random-normal.pbtxt
index b2d675b5224a..8301dbbf2ecc 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-random-normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-random-normal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.RandomNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.RandomNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.RandomNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-random-uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-random-uniform.pbtxt
index 513ac89d5c47..809b742218b2 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-random-uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-random-uniform.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.RandomUniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.RandomUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.RandomUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-truncated-normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-truncated-normal.pbtxt
index 08f21648931e..9ea077f5e2b2 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-truncated-normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-truncated-normal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.TruncatedNormal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.TruncatedNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.TruncatedNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-variance-scaling.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-variance-scaling.pbtxt
index 5e6d5f35c5cd..bf6aecad7088 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-variance-scaling.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-variance-scaling.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.VarianceScaling"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.-zeros.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.-zeros.pbtxt
index 0099a64ff46e..40b430b1a17e 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.-zeros.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.-zeros.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.Zeros"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Zeros\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Zeros\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.constant.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.constant.pbtxt
index 7324655c00a5..e560d7e5a529 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.constant.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.constant.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.constant"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Constant\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Constant\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.glorot_normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.glorot_normal.pbtxt
index 40f65fb43553..a2aaabf88dd4 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.glorot_normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.glorot_normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.glorot_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.GlorotNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.GlorotNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.glorot_uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.glorot_uniform.pbtxt
index c42584c3a141..841e2648282c 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.glorot_uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.glorot_uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.glorot_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.GlorotUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.GlorotUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.he_normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.he_normal.pbtxt
index 6393b9aff5fe..cc9a8717cdc2 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.he_normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.he_normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.he_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.HeNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.HeNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.he_uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.he_uniform.pbtxt
index 5fd1fc756205..e3228e20d552 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.he_uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.he_uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.he_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.HeUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.HeUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.identity.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.identity.pbtxt
index 36a49248187a..abf9a4d3c025 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.identity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.identity.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.identity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Identity\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Identity\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.lecun_normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.lecun_normal.pbtxt
index ccaafdfb92cf..df5b58e28453 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.lecun_normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.lecun_normal.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.lecun_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.LecunNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.LecunNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.lecun_uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.lecun_uniform.pbtxt
index 11d760a194d1..741054185c4f 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.lecun_uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.lecun_uniform.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.initializers.lecun_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.LecunUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.LecunUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.ones.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.ones.pbtxt
index 14f2451847c3..73fb315ecc4f 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.ones.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.ones.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.ones"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Ones\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Ones\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.orthogonal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.orthogonal.pbtxt
index f89f58130291..94025290bc98 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.orthogonal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.orthogonal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.orthogonal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Orthogonal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Orthogonal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.random_normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.random_normal.pbtxt
index e3fb9636460d..d445f96f8c99 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.random_normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.random_normal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.random_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.RandomNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.RandomNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.random_uniform.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.random_uniform.pbtxt
index b79f374e9bfd..b02d8cd54bd0 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.random_uniform.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.random_uniform.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.random_uniform"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.RandomUniform\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.RandomUniform\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.truncated_normal.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.truncated_normal.pbtxt
index b03849a5c3e2..a9d0650a5742 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.truncated_normal.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.truncated_normal.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.truncated_normal"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.TruncatedNormal\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.TruncatedNormal\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.variance_scaling.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.variance_scaling.pbtxt
index d5e4f79ae9c1..eaa0ed75dc95 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.variance_scaling.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.variance_scaling.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.variance_scaling"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.VarianceScaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.VarianceScaling\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.initializers.zeros.pbtxt b/keras/api/golden/v2/tensorflow.keras.initializers.zeros.pbtxt
index fc2bbae6c7c4..88770d1be604 100644
--- a/keras/api/golden/v2/tensorflow.keras.initializers.zeros.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.initializers.zeros.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.initializers.zeros"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Zeros\'>"
-  is_instance: "<class \'tensorflow.python.keras.initializers.initializers_v2.Initializer\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Zeros\'>"
+  is_instance: "<class \'keras.initializers.initializers_v2.Initializer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
index 5495727a3313..df293158bafc 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-abstract-r-n-n-cell.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.AbstractRNNCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.AbstractRNNCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.AbstractRNNCell\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-activation.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-activation.pbtxt
index 610fe3840a9e..a6197fabe83f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-activation.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-activation.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Activation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Activation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Activation\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-activity-regularization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-activity-regularization.pbtxt
index c00349b14879..8b3b98d474d9 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-activity-regularization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-activity-regularization.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ActivityRegularization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.ActivityRegularization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.ActivityRegularization\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-add.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-add.pbtxt
index 2ec76e782122..1da66c96075e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-add.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-add.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Add"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Add\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Add\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-additive-attention.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-additive-attention.pbtxt
index b1780f501ed5..c92117a14857 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-additive-attention.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-additive-attention.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AdditiveAttention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.AdditiveAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.BaseDenseAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.dense_attention.AdditiveAttention\'>"
+  is_instance: "<class \'keras.layers.dense_attention.BaseDenseAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-alpha-dropout.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-alpha-dropout.pbtxt
index b70539648180..309844677980 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-alpha-dropout.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-alpha-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.AlphaDropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.AlphaDropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.AlphaDropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-attention.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-attention.pbtxt
index 9481cbc18f45..e746737b6cd0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-attention.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-attention.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Attention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.Attention\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.dense_attention.BaseDenseAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.dense_attention.Attention\'>"
+  is_instance: "<class \'keras.layers.dense_attention.BaseDenseAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling1-d.pbtxt
index 4fc49aa433a8..8fca0bdcd4c0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling2-d.pbtxt
index ec5df5c667af..dc3328059231 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling3-d.pbtxt
index 4e3d41ee5dde..f9b7ccedeaf7 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-average-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AveragePooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-average.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-average.pbtxt
index 2b092efb8337..73480f672425 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-average.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-average.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Average"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Average\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Average\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool1-d.pbtxt
index 81124e1682bf..d3da73fad951 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool2-d.pbtxt
index e861fda8107e..149b5c1f718c 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool3-d.pbtxt
index 161e0372d63b..9f8cacf4355b 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-avg-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.AvgPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.AveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.AveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-batch-normalization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-batch-normalization.pbtxt
index ae5337ae3163..ea3cbc38e159 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-batch-normalization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-batch-normalization.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.BatchNormalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization_v2.BatchNormalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.BatchNormalizationBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.normalization_v2.BatchNormalization\'>"
+  is_instance: "<class \'keras.layers.normalization.BatchNormalizationBase\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-bidirectional.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-bidirectional.pbtxt
index 7e926162ade9..2fdd02d947a0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-bidirectional.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-bidirectional.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Bidirectional"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Bidirectional\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.Bidirectional\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-concatenate.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-concatenate.pbtxt
index e716c8c49214..3ad674e06703 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-concatenate.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-concatenate.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Concatenate"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Concatenate\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Concatenate\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
index 3c34852d7e6a..73c608fe7eba 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.ConvLSTM2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional_recurrent.ConvLSTM2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional_recurrent.ConvRNN2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional_recurrent.ConvLSTM2D\'>"
+  is_instance: "<class \'keras.layers.convolutional_recurrent.ConvRNN2D\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
index 8c4c827b92b1..03c58f282419 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv1DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d.pbtxt
index b503a8c75f69..bc3c8b851ca7 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
index 43e6f7f332ef..fe8566a777cf 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv2DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d.pbtxt
index 2a33509d196f..b72f33269f92 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
index 9a1fc4949e7f..ad4674f898db 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Conv3DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d.pbtxt
index d6c0ad0d151f..a26575cedc28 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-conv3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Conv3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
index 66cdc51c355b..7c73e667445d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution1DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d.pbtxt
index 517f2505bdb2..031b9bef607d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
index a609dcdb55f1..f228d2285f55 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution2DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d.pbtxt
index 10adc4ce928a..5923c7e300a3 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
index ea0ee3028b3d..968f92e16fd3 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.Convolution3DTranspose"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3DTranspose\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3DTranspose\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d.pbtxt
index 6e5d6bc942e4..3d0e64a40eae 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-convolution3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Convolution3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv3D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-cropping1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-cropping1-d.pbtxt
index c366341d8a4a..d3c0c4667510 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-cropping1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-cropping1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-cropping2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-cropping2-d.pbtxt
index ce86e9a44b4d..066ab2a5ebe0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-cropping2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-cropping2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-cropping3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-cropping3-d.pbtxt
index d46d79f30deb..429e27621232 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-cropping3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-cropping3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Cropping3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Cropping3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.Cropping3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-dense-features.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-dense-features.pbtxt
index a73b2ad5cb73..9e944ad67950 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-dense-features.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-dense-features.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.DenseFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.feature_column.dense_features_v2.DenseFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.feature_column.dense_features.DenseFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.feature_column.dense_features_v2.DenseFeatures\'>"
+  is_instance: "<class \'keras.feature_column.dense_features.DenseFeatures\'>"
+  is_instance: "<class \'keras.feature_column.base_feature_layer._BaseFeaturesLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-dense.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-dense.pbtxt
index bc7ddcea718d..ba72f4688f21 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-dense.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-dense.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Dense"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dense\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Dense\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
index 891a5b201b28..a87b8c5caa5f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.DepthwiseConv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.DepthwiseConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.DepthwiseConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-dot.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-dot.pbtxt
index 5ba7cd1a3856..e0707b9f5216 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-dot.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-dot.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Dot"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Dot\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Dot\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-dropout.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-dropout.pbtxt
index 66045e97b8f1..f27e4fbd0e88 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-dropout.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Dropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-e-l-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-e-l-u.pbtxt
index 8ba42c66f06e..648d18008d5e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-e-l-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-e-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ELU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ELU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ELU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-embedding.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-embedding.pbtxt
index 5f5149dc5c2f..0a3c4d4580c9 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-embedding.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-embedding.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Embedding"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.embeddings.Embedding\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.embeddings.Embedding\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-flatten.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-flatten.pbtxt
index 8bdcee57fa24..caff18cbad22 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-flatten.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-flatten.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Flatten"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Flatten\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Flatten\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u-cell.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u-cell.pbtxt
index 38aa2bb7199c..f4119ff18c51 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u-cell.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u-cell.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.GRUCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent_v2.GRUCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.GRUCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent_v2.GRUCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.GRUCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u.pbtxt
index f0f34aa67962..11f193a41067 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-g-r-u.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.layers.GRU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent_v2.GRU\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.GRU\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent_v2.GRU\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.layers.recurrent.GRU\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-dropout.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-dropout.pbtxt
index 6273d7986a4a..db3eef7b4c02 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-dropout.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-dropout.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.GaussianDropout"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.GaussianDropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.GaussianDropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-noise.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-noise.pbtxt
index e6debc89415c..751694fa8388 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-noise.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-gaussian-noise.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.GaussianNoise"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.noise.GaussianNoise\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.noise.GaussianNoise\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
index 08c9a1001619..8d5ae77c81d0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
index d6e3f1252cb0..0a2e2c477c96 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
index 94e9a96b88f1..de839684f401 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAveragePooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
index 00afd5fc9670..8cc77cdbc5d7 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
index 18d826fdd135..f2419b09090f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
index 92e8876f5c48..5eabc02b4a1a 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalAvgPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalAveragePooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalAveragePooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
index f9b8b1778f41..a43af7a0978a 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
index 4bfcac30602c..511b6099ef56 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
index 0762ac1e7677..b5e6918495e0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
index 69ff605469c8..c8186456e84f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
index e05fb04f0b2a..dd375091238b 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
index 1268fbf60b09..6dbb191272cf 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.GlobalMaxPooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalMaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.GlobalPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalMaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.GlobalPooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-input-layer.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-input-layer.pbtxt
index 7ce532a54c63..90456d5e85b4 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-input-layer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-input-layer.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.InputLayer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.input_layer.InputLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.input_layer.InputLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-input-spec.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-input-spec.pbtxt
index c95e3135df88..6f146e09d02e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-input-spec.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-input-spec.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.layers.InputSpec"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.input_spec.InputSpec\'>"
+  is_instance: "<class \'keras.engine.input_spec.InputSpec\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
index 42cf70b4bffa..c4b6727a4479 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.LSTMCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent_v2.LSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTMCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent_v2.LSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTMCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m.pbtxt
index 67834ac5768d..ff83f32cc097 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-l-s-t-m.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.layers.LSTM"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent_v2.LSTM\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.LSTM\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent_v2.LSTM\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.layers.recurrent.LSTM\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-lambda.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-lambda.pbtxt
index 211c366d9eae..34f3fd474b47 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-lambda.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-lambda.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Lambda"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Lambda\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Lambda\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-layer-normalization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-layer-normalization.pbtxt
index 916abe73f30b..b73a667bb366 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-layer-normalization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-layer-normalization.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LayerNormalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.LayerNormalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.normalization.LayerNormalization\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-layer.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-layer.pbtxt
index 2c4f6df71502..3a38cec1ee82 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-layer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-layer.pbtxt
@@ -1,10 +1,10 @@
 path: "tensorflow.keras.layers.Layer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-leaky-re-l-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
index 3bd0b6a60717..4d0375f6bcc5 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-leaky-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LeakyReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.LeakyReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.LeakyReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected1-d.pbtxt
index 0d178d92f065..cdfa489c8005 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LocallyConnected1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.local.LocallyConnected1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.local.LocallyConnected1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected2-d.pbtxt
index da65b2627074..f8c723fa28cb 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-locally-connected2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.LocallyConnected2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.local.LocallyConnected2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.local.LocallyConnected2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-masking.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-masking.pbtxt
index 8dcd821c0e1c..26f432211af1 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-masking.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-masking.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Masking"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Masking\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Masking\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool1-d.pbtxt
index cce7e92fde3f..01acf33e04f0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool2-d.pbtxt
index 390cb52e228e..36ef7679f5b9 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool3-d.pbtxt
index 4c2ddc2ce123..6ac8af3280d7 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pool3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pool3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPool3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling1-d.pbtxt
index e7956c1029f6..483fa36affb7 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling1D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling2-d.pbtxt
index 014af0a3b63e..9014c0f4b77c 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling2D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling3-d.pbtxt
index 7c1a8e8820eb..3fa263430a5a 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-max-pooling3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.MaxPooling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.MaxPooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.pooling.Pooling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.pooling.MaxPooling3D\'>"
+  is_instance: "<class \'keras.layers.pooling.Pooling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-maximum.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-maximum.pbtxt
index 52286c20c584..155093c4c456 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-maximum.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-maximum.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Maximum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Maximum\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Maximum\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-minimum.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-minimum.pbtxt
index 3ae00343db37..d1a50c505d48 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-minimum.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-minimum.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Minimum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Minimum\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Minimum\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-multi-head-attention.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-multi-head-attention.pbtxt
index 001a8743a914..26d3457fd92f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-multi-head-attention.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-multi-head-attention.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.MultiHeadAttention"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.multi_head_attention.MultiHeadAttention\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.multi_head_attention.MultiHeadAttention\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-multiply.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-multiply.pbtxt
index 1b9ec5357feb..f1af7f6dc84d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-multiply.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-multiply.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Multiply"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Multiply\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Multiply\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-p-re-l-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-p-re-l-u.pbtxt
index 6b26c702b125..edfd6f3b5da8 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-p-re-l-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-p-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.PReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.PReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.PReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-permute.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-permute.pbtxt
index c79315618a46..d9679573fb52 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-permute.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-permute.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Permute"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Permute\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Permute\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-r-n-n.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-r-n-n.pbtxt
index c09439b70280..1546d9a16254 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-r-n-n.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-r-n-n.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.RNN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-re-l-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-re-l-u.pbtxt
index 4d9f2c18b80c..b90c5c3a310d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-re-l-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-repeat-vector.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-repeat-vector.pbtxt
index a9ab889dd55e..a54a4b0d0926 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-repeat-vector.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-repeat-vector.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.RepeatVector"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.RepeatVector\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.RepeatVector\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-reshape.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-reshape.pbtxt
index 4ac4c4fe8f6f..cdeb443e8032 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-reshape.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-reshape.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Reshape"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Reshape\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.Reshape\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv1-d.pbtxt
index 664b4ec2547c..9067707a2e9d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv1-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConv1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv2-d.pbtxt
index 6ab78380d990..09ec7bc1aa19 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-separable-conv2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConv2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
index 5e5aff38b199..24deb6cb3315 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution1-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConvolution1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv1D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
index 7560106c96e1..48d439d015e6 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-separable-convolution2-d.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.SeparableConvolution2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.SeparableConv\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.Conv\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv2D\'>"
+  is_instance: "<class \'keras.layers.convolutional.SeparableConv\'>"
+  is_instance: "<class \'keras.layers.convolutional.Conv\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
index 4b9153429225..427cd60bd20e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SimpleRNNCell"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.SimpleRNNCell\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.DropoutRNNCellMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.SimpleRNNCell\'>"
+  is_instance: "<class \'keras.layers.recurrent.DropoutRNNCellMixin\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n.pbtxt
index f5b25907cc67..ee61e8e4b5ff 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-simple-r-n-n.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SimpleRNN"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.SimpleRNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.RNN\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.SimpleRNN\'>"
+  is_instance: "<class \'keras.layers.recurrent.RNN\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activation"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-softmax.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-softmax.pbtxt
index aebd00c9d980..1dad1e370b6b 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-softmax.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-softmax.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Softmax"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.Softmax\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.Softmax\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
index 415259bfbcf3..a257707b8773 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout1D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
index 59c314862784..b544a432e46c 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout2D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
index 760e6592808f..d1e590185fad 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.SpatialDropout3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.core.SpatialDropout3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.core.Dropout\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.core.SpatialDropout3D\'>"
+  is_instance: "<class \'keras.layers.core.Dropout\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
index bd454ac60ec9..bc11b43eb1d6 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.StackedRNNCells"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.recurrent.StackedRNNCells\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.recurrent.StackedRNNCells\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-subtract.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-subtract.pbtxt
index e9c00b514155..b39738f2bf03 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-subtract.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-subtract.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.Subtract"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.merge.Subtract\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.merge._Merge\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.merge.Subtract\'>"
+  is_instance: "<class \'keras.layers.merge._Merge\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
index 407c860c0333..b82f225781c8 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ThresholdedReLU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.advanced_activations.ThresholdedReLU\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.advanced_activations.ThresholdedReLU\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-time-distributed.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-time-distributed.pbtxt
index d0f7619d1bf0..6ae331372f00 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-time-distributed.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-time-distributed.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.TimeDistributed"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.TimeDistributed\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.TimeDistributed\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling1-d.pbtxt
index 7561273844e8..9594f4d05136 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling2-d.pbtxt
index 428f43d7523e..5a8cee9a6a4f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling3-d.pbtxt
index 482ecf32e2a8..fb0b7eb3e1a4 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-up-sampling3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.UpSampling3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.UpSampling3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.UpSampling3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-wrapper.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-wrapper.pbtxt
index 8732026d388b..bc0dde399718 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-wrapper.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-wrapper.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.Wrapper"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.wrappers.Wrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.wrappers.Wrapper\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding1-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding1-d.pbtxt
index 2312af6ebacc..de912ff7dae1 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding1-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding1-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding1D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding1D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding1D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding2-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding2-d.pbtxt
index 8937e9de579a..79116bf4319e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding2-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding2-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding2D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding2D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding2D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding3-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding3-d.pbtxt
index 795ad24a3ac9..f46bb3fff9dc 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding3-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.-zero-padding3-d.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.ZeroPadding3D"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.convolutional.ZeroPadding3D\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.convolutional.ZeroPadding3D\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
index 0242b10c649b..ea13f53e4ba0 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-einsum-dense.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.EinsumDense"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.einsum_dense.EinsumDense\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.einsum_dense.EinsumDense\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
index 425c5e459341..6cb7a2fb8abe 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-random-fourier-features.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.RandomFourierFeatures"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.kernelized.RandomFourierFeatures\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.kernelized.RandomFourierFeatures\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-sync-batch-normalization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-sync-batch-normalization.pbtxt
index 40ee84d3ff71..ca9b79774d2f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.-sync-batch-normalization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.-sync-batch-normalization.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.SyncBatchNormalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization_v2.SyncBatchNormalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.normalization.BatchNormalizationBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.normalization_v2.SyncBatchNormalization\'>"
+  is_instance: "<class \'keras.layers.normalization.BatchNormalizationBase\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
index e66d46d4260b..59f1a8644d77 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-crossing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CategoryCrossing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.category_crossing.CategoryCrossing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.category_crossing.CategoryCrossing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
index de99a1671fd7..40e8ab0012ec 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-category-encoding.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CategoryEncoding"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.category_encoding.CategoryEncoding\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.category_encoding.CategoryEncoding\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
index 87cea69230c4..234263a3c53d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-center-crop.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.CenterCrop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.CenterCrop\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.CenterCrop\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
index 2f75c151d66f..cc23668ff93b 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.-discretizing-combiner.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Discretization.DiscretizingCombiner"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.discretization.Discretization.DiscretizingCombiner\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.Combiner\'>"
+  is_instance: "<class \'keras.layers.preprocessing.discretization.Discretization.DiscretizingCombiner\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.Combiner\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
index 8042ef88f6bc..794a5bd0fe1f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-discretization.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Discretization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.discretization.Discretization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.discretization.Discretization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "DiscretizingCombiner"
@@ -143,7 +143,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'bin_boundaries\', \'num_bins\', \'epsilon\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'0.01\'], "
+    argspec: "args=[\'self\', \'bins\', \'epsilon\'], varargs=None, keywords=kwargs, defaults=[\'0.01\'], "
   }
   member_method {
     name: "adapt"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
index ac173d6cbe6a..818f266bac44 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-hashing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Hashing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.hashing.Hashing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.hashing.Hashing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
index c469437cb77d..ec5dae514a79 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-integer-lookup.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.IntegerLookup"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.integer_lookup.IntegerLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.integer_lookup.IntegerLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup.IndexLookup\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
index 18b0f8c94f9d..9ad21bd636c8 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-normalization.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Normalization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.normalization.Normalization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.normalization.Normalization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
index f5ad8914df65..d161e2fae127 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-preprocessing-layer.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.PreprocessingLayer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
index 581f53d21632..a70f83d04331 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-contrast.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomContrast"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomContrast\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomContrast\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
index 82fc1918b351..e65f8a90e03b 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-crop.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomCrop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomCrop\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomCrop\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
index 8219f5b21717..c0902fcb6011 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-flip.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomFlip"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomFlip\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomFlip\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
index 76c813930d4c..0b8f9389015a 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-height.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomHeight"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomHeight\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomHeight\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
index 3fce39b8c4f7..4b1d2de5a3f4 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-rotation.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomRotation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomRotation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomRotation\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
index 560c4caef3d2..7685d8012c6f 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-translation.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomTranslation"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomTranslation\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomTranslation\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
index 8ba03b5ec5d3..006d0521d573 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-width.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomWidth"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomWidth\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomWidth\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
index 13acf89033ce..e48a8801cf3d 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-random-zoom.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.RandomZoom"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.RandomZoom\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.RandomZoom\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
index 3fa626ff3487..62afc26c248c 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-rescaling.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Rescaling"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.Rescaling\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.Rescaling\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
index 467b28635646..878cadbc9e4e 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-resizing.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.Resizing"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.image_preprocessing.Resizing\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.image_preprocessing.Resizing\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
index bfb662c93089..2ed099535e10 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-string-lookup.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.StringLookup"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.string_lookup.StringLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.index_lookup.IndexLookup\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.string_lookup.StringLookup\'>"
+  is_instance: "<class \'keras.layers.preprocessing.index_lookup.IndexLookup\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
index 039c82686d2e..a71a58ea69fb 100644
--- a/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.layers.experimental.preprocessing.-text-vectorization.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.layers.experimental.preprocessing.TextVectorization"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.layers.preprocessing.text_vectorization.TextVectorization\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.layers.preprocessing.text_vectorization.TextVectorization\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.CombinerPreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_preprocessing_layer.PreprocessingLayer\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
@@ -139,7 +139,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'max_tokens\', \'standardize\', \'split\', \'ngrams\', \'output_mode\', \'output_sequence_length\', \'pad_to_max_tokens\', \'vocabulary\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'lower_and_strip_punctuation\', \'whitespace\', \'None\', \'int\', \'None\', \'False\', \'None\'], "
+    argspec: "args=[\'self\', \'max_tokens\', \'standardize\', \'split\', \'ngrams\', \'output_mode\', \'output_sequence_length\', \'pad_to_max_tokens\', \'vocabulary\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'lower_and_strip_punctuation\', \'whitespace\', \'None\', \'int\', \'None\', \'True\', \'None\'], "
   }
   member_method {
     name: "adapt"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-binary-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-binary-crossentropy.pbtxt
index 9ccd6bb75811..28c121028418 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-binary-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-binary-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.BinaryCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.BinaryCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.BinaryCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-categorical-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
index 919bedcc2cde..df4ca0c38ca3 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-categorical-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-categorical-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-categorical-hinge.pbtxt
index d298a550c34f..fc23af9c5b75 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-categorical-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-categorical-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CategoricalHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CategoricalHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CategoricalHinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-cosine-similarity.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-cosine-similarity.pbtxt
index 661375b89178..7bd4ab61c50b 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-cosine-similarity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-cosine-similarity.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.CosineSimilarity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.CosineSimilarity\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.CosineSimilarity\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-hinge.pbtxt
index 7ad839d86c21..a154c2a2964b 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Hinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Hinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Hinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-huber.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-huber.pbtxt
index 678c57eb7a3d..b9da506b5ce8 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-huber.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-huber.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Huber"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Huber\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Huber\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-k-l-divergence.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-k-l-divergence.pbtxt
index b15ba6f2d6d1..b16a275a9191 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-k-l-divergence.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-k-l-divergence.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.KLDivergence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.KLDivergence\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.KLDivergence\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-log-cosh.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-log-cosh.pbtxt
index 1bdc6751a4a3..97253a93e3cd 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-log-cosh.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-log-cosh.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.LogCosh"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.LogCosh\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.LogCosh\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-loss.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-loss.pbtxt
index 54316ffdee1a..f6e062b14609 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-loss.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-loss.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.losses.Loss"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-error.pbtxt
index 711ca17e4ab5..91dab6787d8a 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanAbsoluteError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanAbsoluteError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanAbsoluteError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
index cb4e2aea0c23..f4c1b5cf0220 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-mean-absolute-percentage-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanAbsolutePercentageError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanAbsolutePercentageError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanAbsolutePercentageError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-error.pbtxt
index e9a3a4d8dde1..815bddaf39b4 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanSquaredError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
index 572a10653d9b..d08388055fdf 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-mean-squared-logarithmic-error.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.MeanSquaredLogarithmicError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.MeanSquaredLogarithmicError\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.MeanSquaredLogarithmicError\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-poisson.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-poisson.pbtxt
index 86cf81207d5b..5313398aad17 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-poisson.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-poisson.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.Poisson"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.Poisson\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.Poisson\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-reduction.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-reduction.pbtxt
index 99a187bf3b8f..226a8ba193f6 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-reduction.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-reduction.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.losses.Reduction"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.losses_utils.ReductionV2\'>"
+  is_instance: "<class \'keras.utils.losses_utils.ReductionV2\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "AUTO"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
index 58ace3fcd0c2..06d9cfe145ee 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-sparse-categorical-crossentropy.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.SparseCategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.SparseCategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.SparseCategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.losses.-squared-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.losses.-squared-hinge.pbtxt
index 453e321a4bd6..3f2cf2c5b131 100644
--- a/keras/api/golden/v2/tensorflow.keras.losses.-squared-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.losses.-squared-hinge.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.losses.SquaredHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.losses.SquaredHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.LossFunctionWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.losses.Loss\'>"
+  is_instance: "<class \'keras.losses.SquaredHinge\'>"
+  is_instance: "<class \'keras.losses.LossFunctionWrapper\'>"
+  is_instance: "<class \'keras.losses.Loss\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-a-u-c.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-a-u-c.pbtxt
index 3fb5b4802138..fcb4b2792972 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-a-u-c.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-a-u-c.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.AUC"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.AUC\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.AUC\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-accuracy.pbtxt
index 4c548fb34a7e..a778890c498c 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Accuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Accuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Accuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-binary-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-binary-accuracy.pbtxt
index e0f164e12f3b..35bb7dc5d73f 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-binary-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-binary-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.BinaryAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.BinaryAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.BinaryAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-binary-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
index 08c3c76f2d1f..c97015ff2935 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-binary-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.BinaryCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.BinaryCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.BinaryCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
index 8a2483ec4905..90cb6e472cf6 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
index f946beea9b77..1295bed96521 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-hinge.pbtxt
index 98e2638ffa0e..97dfe2c6afb8 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-categorical-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CategoricalHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CategoricalHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CategoricalHinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-cosine-similarity.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-cosine-similarity.pbtxt
index 31ec822f275c..fc09955d25b0 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-cosine-similarity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-cosine-similarity.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.CosineSimilarity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.CosineSimilarity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.CosineSimilarity\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-false-negatives.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-false-negatives.pbtxt
index 27e12f944214..51eae0e38eca 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-false-negatives.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-false-negatives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.FalseNegatives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.FalseNegatives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.FalseNegatives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-false-positives.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-false-positives.pbtxt
index 0aadcd5e74f1..9c75d95a04b5 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-false-positives.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-false-positives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.FalsePositives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.FalsePositives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.FalsePositives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-hinge.pbtxt
index 3dd48b8fd9b2..2d9d51fe7913 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Hinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Hinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Hinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-k-l-divergence.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-k-l-divergence.pbtxt
index 15be4cf90ae7..58821f18b49f 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-k-l-divergence.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-k-l-divergence.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.KLDivergence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.KLDivergence\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.KLDivergence\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-log-cosh-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-log-cosh-error.pbtxt
index e95062e5f618..1a237253fb8e 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-log-cosh-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-log-cosh-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.LogCoshError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.LogCoshError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.LogCoshError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
index 5ba92082c3c1..4b6f7cec441b 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanAbsoluteError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanAbsoluteError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanAbsoluteError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
index 9db66d3830c2..f10e46b74351 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-absolute-percentage-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanAbsolutePercentageError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanAbsolutePercentageError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanAbsolutePercentageError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-io-u.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-io-u.pbtxt
index 72b5c56fb123..08c8202a23e7 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-io-u.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-io-u.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.MeanIoU"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanIoU\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanIoU\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-relative-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-relative-error.pbtxt
index 2f903b5fe7d7..088074b9f095 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-relative-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-relative-error.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.metrics.MeanRelativeError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanRelativeError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanRelativeError\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-error.pbtxt
index accbfc7b1d51..b818fc5c0e98 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanSquaredError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
index 43c7fe0f9136..2f27f9453d1b 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-squared-logarithmic-error.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.MeanSquaredLogarithmicError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanSquaredLogarithmicError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanSquaredLogarithmicError\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-tensor.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-tensor.pbtxt
index e401e07ac24d..42a8b9542e66 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean-tensor.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean-tensor.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.MeanTensor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanTensor\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.MeanTensor\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-mean.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-mean.pbtxt
index 5e841b719ac2..d22f32a247cd 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-mean.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-mean.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.Mean"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-metric.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-metric.pbtxt
index 49ab2c287d07..524ba9e1292d 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-metric.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-metric.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.metrics.Metric"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-poisson.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-poisson.pbtxt
index 4642d904d701..1a80b71b9451 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-poisson.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-poisson.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.Poisson"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Poisson\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Poisson\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-precision-at-recall.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-precision-at-recall.pbtxt
index d90685ac3dc8..bf113a9cc70a 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-precision-at-recall.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-precision-at-recall.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.PrecisionAtRecall"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.PrecisionAtRecall\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.PrecisionAtRecall\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-precision.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-precision.pbtxt
index c06b5215e0f5..50cc787db95d 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-precision.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-precision.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.Precision"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Precision\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Precision\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-recall-at-precision.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-recall-at-precision.pbtxt
index 724e66ccb04e..d87c551436d7 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-recall-at-precision.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-recall-at-precision.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.RecallAtPrecision"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.RecallAtPrecision\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.RecallAtPrecision\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-recall.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-recall.pbtxt
index 5ff74c9b1714..6cee679c2ae4 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-recall.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-recall.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.metrics.Recall"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Recall\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Recall\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
index e9e4941e6ead..d9f3ffa950fc 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-root-mean-squared-error.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.metrics.RootMeanSquaredError"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.RootMeanSquaredError\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.RootMeanSquaredError\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
index c9eaa6c42a55..1698d9d7f946 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-sensitivity-at-specificity.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.SensitivityAtSpecificity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivityAtSpecificity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SensitivityAtSpecificity\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
index 9f758618f433..f6dfa927150c 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
index 8d3426a894af..c9c1604757f7 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-categorical-crossentropy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseCategoricalCrossentropy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseCategoricalCrossentropy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseCategoricalCrossentropy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
index a2af5ece179a..0cff6b69654f 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-sparse-top-k-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SparseTopKCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SparseTopKCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SparseTopKCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
index 3100ede89167..984a5381adb4 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-specificity-at-sensitivity.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.SpecificityAtSensitivity"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SpecificityAtSensitivity\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.SensitivitySpecificityBase\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SpecificityAtSensitivity\'>"
+  is_instance: "<class \'keras.metrics.SensitivitySpecificityBase\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-squared-hinge.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-squared-hinge.pbtxt
index 9c46c7b65360..10a039b91967 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-squared-hinge.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-squared-hinge.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.SquaredHinge"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.SquaredHinge\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.SquaredHinge\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-sum.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-sum.pbtxt
index 6a73fe957d6c..87679573a3ac 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-sum.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-sum.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.Sum"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.Sum\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.Sum\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
index fdfa0285ffe5..882a29027b2f 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-top-k-categorical-accuracy.pbtxt
@@ -1,15 +1,15 @@
 path: "tensorflow.keras.metrics.TopKCategoricalAccuracy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TopKCategoricalAccuracy\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.MeanMetricWrapper\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Mean\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Reduce\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TopKCategoricalAccuracy\'>"
+  is_instance: "<class \'keras.metrics.MeanMetricWrapper\'>"
+  is_instance: "<class \'keras.metrics.Mean\'>"
+  is_instance: "<class \'keras.metrics.Reduce\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-true-negatives.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-true-negatives.pbtxt
index 39a06287507f..9c55c1dd98c6 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-true-negatives.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-true-negatives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.TrueNegatives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TrueNegatives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TrueNegatives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.metrics.-true-positives.pbtxt b/keras/api/golden/v2/tensorflow.keras.metrics.-true-positives.pbtxt
index f5c09b68593d..a302860d3e46 100644
--- a/keras/api/golden/v2/tensorflow.keras.metrics.-true-positives.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.metrics.-true-positives.pbtxt
@@ -1,13 +1,13 @@
 path: "tensorflow.keras.metrics.TruePositives"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.metrics.TruePositives\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics._ConfusionMatrixConditionCount\'>"
-  is_instance: "<class \'tensorflow.python.keras.metrics.Metric\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.metrics.TruePositives\'>"
+  is_instance: "<class \'keras.metrics._ConfusionMatrixConditionCount\'>"
+  is_instance: "<class \'keras.metrics.Metric\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt b/keras/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
index 3bea3a9f8fed..d9215a74cf85 100644
--- a/keras/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.mixed_precision.LossScaleOptimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt b/keras/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt
index 278d4fe120e0..dc2141f4f839 100644
--- a/keras/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.mixed_precision.Policy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.policy.Policy\'>"
+  is_instance: "<class \'keras.mixed_precision.policy.Policy\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "compute_dtype"
diff --git a/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt b/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
index a68c17e8f247..0c4bb68fe640 100644
--- a/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt
@@ -1,9 +1,9 @@
 path: "tensorflow.keras.mixed_precision.experimental.LossScaleOptimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizerV1\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizerV1\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer.LossScaleOptimizer\'>"
+  is_instance: "<class \'keras.mixed_precision.loss_scale_optimizer._DelegatingTrackableMixin\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt b/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt
index 74b342efdb4b..3e4da7d2bcaa 100644
--- a/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.mixed_precision.experimental.Policy"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.policy.PolicyV1\'>"
-  is_instance: "<class \'tensorflow.python.keras.mixed_precision.policy.Policy\'>"
+  is_instance: "<class \'keras.mixed_precision.policy.PolicyV1\'>"
+  is_instance: "<class \'keras.mixed_precision.policy.Policy\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "compute_dtype"
diff --git a/keras/api/golden/v2/tensorflow.keras.models.-model.pbtxt b/keras/api/golden/v2/tensorflow.keras.models.-model.pbtxt
index 0c837d030c35..8bbaf3505d96 100644
--- a/keras/api/golden/v2/tensorflow.keras.models.-model.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.models.-model.pbtxt
@@ -1,12 +1,12 @@
 path: "tensorflow.keras.models.Model"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.models.-sequential.pbtxt b/keras/api/golden/v2/tensorflow.keras.models.-sequential.pbtxt
index 4a595abe9dbe..2f19e5ef277d 100644
--- a/keras/api/golden/v2/tensorflow.keras.models.-sequential.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.models.-sequential.pbtxt
@@ -1,14 +1,14 @@
 path: "tensorflow.keras.models.Sequential"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.engine.sequential.Sequential\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.functional.Functional\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
-  is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
+  is_instance: "<class \'keras.engine.sequential.Sequential\'>"
+  is_instance: "<class \'keras.engine.functional.Functional\'>"
+  is_instance: "<class \'keras.engine.training.Model\'>"
+  is_instance: "<class \'keras.engine.base_layer.Layer\'>"
   is_instance: "<class \'tensorflow.python.module.module.Module\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.LayerVersionSelector\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.version_utils.ModelVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.LayerVersionSelector\'>"
+  is_instance: "<class \'keras.utils.version_utils.ModelVersionSelector\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "activity_regularizer"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-adadelta.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-adadelta.pbtxt
index 0a297df71a98..1bc3f05395d4 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-adadelta.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-adadelta.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adadelta"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adadelta.Adadelta\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adadelta.Adadelta\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-adagrad.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-adagrad.pbtxt
index 1ec4e30e3f26..e19692ef7b5c 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-adagrad.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-adagrad.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adagrad"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adagrad.Adagrad\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adagrad.Adagrad\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-adam.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-adam.pbtxt
index a6deef2da307..5554eca222df 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-adam.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-adam.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adam"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adam.Adam\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adam.Adam\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-adamax.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-adamax.pbtxt
index ccb9bebb1953..60b8e121478e 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-adamax.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-adamax.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Adamax"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.adamax.Adamax\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.adamax.Adamax\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-ftrl.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-ftrl.pbtxt
index eab98ac6d06c..0dded428bf6a 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-ftrl.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-ftrl.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Ftrl"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.ftrl.Ftrl\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.ftrl.Ftrl\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-nadam.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-nadam.pbtxt
index 81cce2fbbecc..522e1212fee7 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-nadam.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-nadam.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.Nadam"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.nadam.Nadam\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.nadam.Nadam\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-optimizer.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-optimizer.pbtxt
index badb430ca1f0..20cf1c540492 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-optimizer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-optimizer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.optimizers.Optimizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-r-m-sprop.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
index bcc8c6019db2..ee6beafeb20c 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-r-m-sprop.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.RMSprop"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.rmsprop.RMSprop\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.rmsprop.RMSprop\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.-s-g-d.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.-s-g-d.pbtxt
index db673eedc118..fe635912d61a 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.-s-g-d.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.-s-g-d.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.SGD"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.gradient_descent.SGD\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
+  is_instance: "<class \'keras.optimizer_v2.gradient_descent.SGD\'>"
+  is_instance: "<class \'keras.optimizer_v2.optimizer_v2.OptimizerV2\'>"
   is_instance: "<class \'tensorflow.python.training.tracking.base.Trackable\'>"
   is_instance: "<type \'object\'>"
   member {
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
index 41a5cbfe11c1..965bea136d6f 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay-restarts.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.CosineDecayRestarts"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecayRestarts\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
index 299ff85e8135..cd3a0a876d63 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-cosine-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.CosineDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.CosineDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
index 25ae478cb2c6..e0d4bbaceaab 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-exponential-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.ExponentialDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.ExponentialDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.ExponentialDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
index b2fe61f4d2cb..a4bd93e25856 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-inverse-time-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.InverseTimeDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.InverseTimeDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.InverseTimeDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
index 3b33bd7526bd..b1962e9d64fd 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-learning-rate-schedule.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.optimizers.schedules.LearningRateSchedule"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
index 6f1496492abf..58b1504bd08e 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-piecewise-constant-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.PiecewiseConstantDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.PiecewiseConstantDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.PiecewiseConstantDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
index 728436c36111..f610501d46cf 100644
--- a/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.optimizers.schedules.-polynomial-decay.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.optimizers.schedules.PolynomialDecay"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.PolynomialDecay\'>"
-  is_instance: "<class \'tensorflow.python.keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.PolynomialDecay\'>"
+  is_instance: "<class \'keras.optimizer_v2.learning_rate_schedule.LearningRateSchedule\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
index e1ed382d754c..1cf45d07ff46 100644
--- a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt
@@ -1,11 +1,11 @@
 path: "tensorflow.keras.preprocessing.image.DirectoryIterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.DirectoryIterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.DirectoryIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.directory_iterator.DirectoryIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.BatchFromFilesMixin\'>"
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "allowed_class_modes"
diff --git a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
index 4e51b0907704..a7a29fe3d3b4 100644
--- a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.preprocessing.image.ImageDataGenerator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.ImageDataGenerator\'>"
+  is_instance: "<class \'keras.preprocessing.image.ImageDataGenerator\'>"
   is_instance: "<class \'keras_preprocessing.image.image_data_generator.ImageDataGenerator\'>"
   is_instance: "<type \'object\'>"
   member_method {
diff --git a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-iterator.pbtxt b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-iterator.pbtxt
index 089d12f205f2..404906548be3 100644
--- a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-iterator.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-iterator.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.preprocessing.image.Iterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "white_list_formats"
diff --git a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
index 8f3f71d84cda..3bd0a00bd31f 100644
--- a/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt
@@ -1,10 +1,10 @@
 path: "tensorflow.keras.preprocessing.image.NumpyArrayIterator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.NumpyArrayIterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.NumpyArrayIterator\'>"
   is_instance: "<class \'keras_preprocessing.image.numpy_array_iterator.NumpyArrayIterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.image.Iterator\'>"
+  is_instance: "<class \'keras.preprocessing.image.Iterator\'>"
   is_instance: "<class \'keras_preprocessing.image.iterator.Iterator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member {
     name: "white_list_formats"
diff --git a/keras/api/golden/v2/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt b/keras/api/golden/v2/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
index 878c6392f74a..6a4f9efdc499 100644
--- a/keras/api/golden/v2/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt
@@ -1,8 +1,8 @@
 path: "tensorflow.keras.preprocessing.sequence.TimeseriesGenerator"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.preprocessing.sequence.TimeseriesGenerator\'>"
+  is_instance: "<class \'keras.preprocessing.sequence.TimeseriesGenerator\'>"
   is_instance: "<class \'keras_preprocessing.sequence.TimeseriesGenerator\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.-l1-l2.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.-l1-l2.pbtxt
index a45fb7b55e58..b704de99ca07 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.-l1-l2.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.-l1-l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L1L2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.-l1.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.-l1.pbtxt
index 5cb133ca85dd..31d5659bd0fb 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.-l1.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.-l1.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L1"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.-l2.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.-l2.pbtxt
index c5b706d1d2fb..5253aec0fd38 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.-l2.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.-l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.L2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.-regularizer.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.-regularizer.pbtxt
index d9058a0becdc..4a7bbb34f532 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.-regularizer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.-regularizer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.regularizers.Regularizer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.l1.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.l1.pbtxt
index eb769a0dc44d..b3c5b3dfdc00 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.l1.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.l1.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.l1"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L1\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L1\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.regularizers.l2.pbtxt b/keras/api/golden/v2/tensorflow.keras.regularizers.l2.pbtxt
index fda5c76ecd23..4db49bd4449d 100644
--- a/keras/api/golden/v2/tensorflow.keras.regularizers.l2.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.regularizers.l2.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.regularizers.l2"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.regularizers.L2\'>"
-  is_instance: "<class \'tensorflow.python.keras.regularizers.Regularizer\'>"
+  is_instance: "<class \'keras.regularizers.L2\'>"
+  is_instance: "<class \'keras.regularizers.Regularizer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-custom-object-scope.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-custom-object-scope.pbtxt
index 109682046b99..9e9370be68f8 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-custom-object-scope.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-custom-object-scope.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.CustomObjectScope"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.CustomObjectScope\'>"
+  is_instance: "<class \'keras.utils.generic_utils.CustomObjectScope\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-generator-enqueuer.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-generator-enqueuer.pbtxt
index c253afe559a7..ac1c5387bc18 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-generator-enqueuer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-generator-enqueuer.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.utils.GeneratorEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.GeneratorEnqueuer\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.GeneratorEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-ordered-enqueuer.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
index e7e7d2839b26..9cd4b730b325 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-ordered-enqueuer.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.utils.OrderedEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.OrderedEnqueuer\'>"
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.OrderedEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-progbar.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-progbar.pbtxt
index d78825835152..a1b31c0389aa 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-progbar.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-progbar.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.Progbar"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.Progbar\'>"
+  is_instance: "<class \'keras.utils.generic_utils.Progbar\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-sequence-enqueuer.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
index aa36d66f9215..eb3bbc5b897f 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-sequence-enqueuer.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.SequenceEnqueuer"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.SequenceEnqueuer\'>"
+  is_instance: "<class \'keras.utils.data_utils.SequenceEnqueuer\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.-sequence.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.-sequence.pbtxt
index e2dc932dc86d..43e0717ccaae 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.-sequence.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.-sequence.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.Sequence"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.data_utils.Sequence\'>"
+  is_instance: "<class \'keras.utils.data_utils.Sequence\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.utils.custom_object_scope.pbtxt b/keras/api/golden/v2/tensorflow.keras.utils.custom_object_scope.pbtxt
index bfee151ae284..4fa8c7af04e4 100644
--- a/keras/api/golden/v2/tensorflow.keras.utils.custom_object_scope.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.utils.custom_object_scope.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.keras.utils.custom_object_scope"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.utils.generic_utils.CustomObjectScope\'>"
+  is_instance: "<class \'keras.utils.generic_utils.CustomObjectScope\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt b/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
index 67cca3af41db..180e05527f31 100644
--- a/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.wrappers.scikit_learn.KerasClassifier"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.KerasClassifier\'>"
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.BaseWrapper\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.KerasClassifier\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.BaseWrapper\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
diff --git a/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt b/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
index f4b9b7e277ec..0dfc03fb05e5 100644
--- a/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
+++ b/keras/api/golden/v2/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt
@@ -1,7 +1,7 @@
 path: "tensorflow.keras.wrappers.scikit_learn.KerasRegressor"
 tf_class {
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.KerasRegressor\'>"
-  is_instance: "<class \'tensorflow.python.keras.wrappers.scikit_learn.BaseWrapper\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.KerasRegressor\'>"
+  is_instance: "<class \'keras.wrappers.scikit_learn.BaseWrapper\'>"
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"