diff --git a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_classifier_graph_options.proto b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_classifier_graph_options.proto
index 61e367b2..dcefa075 100644
--- a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_classifier_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_classifier_graph_options.proto
@@ -21,7 +21,7 @@ import "mediapipe/framework/calculator.proto";
 import "mediapipe/tasks/cc/components/processors/proto/classifier_options.proto";
 import "mediapipe/tasks/cc/core/proto/base_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer";
+option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer.proto";
 option java_outer_classname = "GestureClassifierGraphOptionsProto";
 
 message GestureClassifierGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_embedder_graph_options.proto b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_embedder_graph_options.proto
index 6170006f..bff4e0a9 100644
--- a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_embedder_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_embedder_graph_options.proto
@@ -20,7 +20,7 @@ package mediapipe.tasks.vision.gesture_recognizer.proto;
 import "mediapipe/framework/calculator.proto";
 import "mediapipe/tasks/cc/core/proto/base_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer";
+option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer.proto";
 option java_outer_classname = "GestureEmbedderGraphOptionsProto";
 
 message GestureEmbedderGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_recognizer_graph_options.proto b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_recognizer_graph_options.proto
index 2afbd507..57d8a374 100644
--- a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_recognizer_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_recognizer_graph_options.proto
@@ -22,7 +22,7 @@ import "mediapipe/tasks/cc/core/proto/base_options.proto";
 import "mediapipe/tasks/cc/vision/gesture_recognizer/proto/hand_gesture_recognizer_graph_options.proto";
 import "mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarker_graph_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer";
+option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer.proto";
 option java_outer_classname = "GestureRecognizerGraphOptionsProto";
 
 message GestureRecognizerGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/hand_gesture_recognizer_graph_options.proto b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/hand_gesture_recognizer_graph_options.proto
index 98284169..a3281702 100644
--- a/mediapipe/tasks/cc/vision/gesture_recognizer/proto/hand_gesture_recognizer_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/gesture_recognizer/proto/hand_gesture_recognizer_graph_options.proto
@@ -23,7 +23,7 @@ import "mediapipe/tasks/cc/core/proto/base_options.proto";
 import "mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_classifier_graph_options.proto";
 import "mediapipe/tasks/cc/vision/gesture_recognizer/proto/gesture_embedder_graph_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer";
+option java_package = "com.google.mediapipe.tasks.vision.gesturerecognizer.proto";
 option java_outer_classname = "HandGestureRecognizerGraphOptionsProto";
 
 message HandGestureRecognizerGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/hand_detector/proto/hand_detector_graph_options.proto b/mediapipe/tasks/cc/vision/hand_detector/proto/hand_detector_graph_options.proto
index be20583d..a009f236 100644
--- a/mediapipe/tasks/cc/vision/hand_detector/proto/hand_detector_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/hand_detector/proto/hand_detector_graph_options.proto
@@ -20,7 +20,7 @@ package mediapipe.tasks.vision.hand_detector.proto;
 import "mediapipe/framework/calculator.proto";
 import "mediapipe/tasks/cc/core/proto/base_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.handdetector";
+option java_package = "com.google.mediapipe.tasks.vision.handdetector.proto";
 option java_outer_classname = "HandDetectorGraphOptionsProto";
 
 message HandDetectorGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarker_graph_options.proto b/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarker_graph_options.proto
index cd4efc04..c985fc7f 100644
--- a/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarker_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarker_graph_options.proto
@@ -22,7 +22,7 @@ import "mediapipe/tasks/cc/core/proto/base_options.proto";
 import "mediapipe/tasks/cc/vision/hand_detector/proto/hand_detector_graph_options.proto";
 import "mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarks_detector_graph_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.handlandmarker";
+option java_package = "com.google.mediapipe.tasks.vision.handlandmarker.proto";
 option java_outer_classname = "HandLandmarkerGraphOptionsProto";
 
 message HandLandmarkerGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarks_detector_graph_options.proto b/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarks_detector_graph_options.proto
index 7b8b45c4..195f6e5c 100644
--- a/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarks_detector_graph_options.proto
+++ b/mediapipe/tasks/cc/vision/hand_landmarker/proto/hand_landmarks_detector_graph_options.proto
@@ -20,7 +20,7 @@ package mediapipe.tasks.vision.hand_landmarker.proto;
 import "mediapipe/framework/calculator.proto";
 import "mediapipe/tasks/cc/core/proto/base_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.handlandmarker";
+option java_package = "com.google.mediapipe.tasks.vision.handlandmarker.proto";
 option java_outer_classname = "HandLandmarksDetectorGraphOptionsProto";
 
 message HandLandmarksDetectorGraphOptions {
diff --git a/mediapipe/tasks/cc/vision/object_detector/proto/object_detector_options.proto b/mediapipe/tasks/cc/vision/object_detector/proto/object_detector_options.proto
index 37edab1d..cba58ace 100644
--- a/mediapipe/tasks/cc/vision/object_detector/proto/object_detector_options.proto
+++ b/mediapipe/tasks/cc/vision/object_detector/proto/object_detector_options.proto
@@ -20,7 +20,7 @@ package mediapipe.tasks.vision.object_detector.proto;
 import "mediapipe/framework/calculator.proto";
 import "mediapipe/tasks/cc/core/proto/base_options.proto";
 
-option java_package = "com.google.mediapipe.tasks.vision.objectdetector";
+option java_package = "com.google.mediapipe.tasks.vision.objectdetector.proto";
 option java_outer_classname = "ObjectDetectorOptionsProto";
 
 message ObjectDetectorOptions {
diff --git a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/gesturerecognizer/GestureRecognizer.java b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/gesturerecognizer/GestureRecognizer.java
index e429cc6d..cc8346d8 100644
--- a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/gesturerecognizer/GestureRecognizer.java
+++ b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/gesturerecognizer/GestureRecognizer.java
@@ -37,9 +37,11 @@ import com.google.mediapipe.tasks.core.TaskRunner;
 import com.google.mediapipe.tasks.core.proto.BaseOptionsProto;
 import com.google.mediapipe.tasks.vision.core.BaseVisionTaskApi;
 import com.google.mediapipe.tasks.vision.core.RunningMode;
-import com.google.mediapipe.tasks.vision.handdetector.HandDetectorGraphOptionsProto;
-import com.google.mediapipe.tasks.vision.handlandmarker.HandLandmarkerGraphOptionsProto;
-import com.google.mediapipe.tasks.vision.handlandmarker.HandLandmarksDetectorGraphOptionsProto;
+import com.google.mediapipe.tasks.vision.gesturerecognizer.proto.GestureRecognizerGraphOptionsProto;
+import com.google.mediapipe.tasks.vision.gesturerecognizer.proto.HandGestureRecognizerGraphOptionsProto;
+import com.google.mediapipe.tasks.vision.handdetector.proto.HandDetectorGraphOptionsProto;
+import com.google.mediapipe.tasks.vision.handlandmarker.proto.HandLandmarkerGraphOptionsProto;
+import com.google.mediapipe.tasks.vision.handlandmarker.proto.HandLandmarksDetectorGraphOptionsProto;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/objectdetector/ObjectDetector.java b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/objectdetector/ObjectDetector.java
index b64992d3..bfce6279 100644
--- a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/objectdetector/ObjectDetector.java
+++ b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/objectdetector/ObjectDetector.java
@@ -33,6 +33,7 @@ import com.google.mediapipe.tasks.core.TaskRunner;
 import com.google.mediapipe.tasks.core.proto.BaseOptionsProto;
 import com.google.mediapipe.tasks.vision.core.BaseVisionTaskApi;
 import com.google.mediapipe.tasks.vision.core.RunningMode;
+import com.google.mediapipe.tasks.vision.objectdetector.proto.ObjectDetectorOptionsProto;
 import com.google.mediapipe.formats.proto.DetectionProto.Detection;
 import java.io.File;
 import java.io.IOException;