diff --git a/common/libs/threads/cuttlefish_thread.h b/common/libs/threads/cuttlefish_thread.h
index c16d970..54e5ceb 100644
--- a/common/libs/threads/cuttlefish_thread.h
+++ b/common/libs/threads/cuttlefish_thread.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-// Concurreny classess for Cloud Android projects.
+// Concurreny classess for cuttlefish.
 //
 // These more or less mimic the interface of the C++ classes:
 //   Mutex is similar to std::mutex
diff --git a/guest/hals/camera/EmulatedCameraFactory.h b/guest/hals/camera/EmulatedCameraFactory.h
index e354e29..64588fd 100755
--- a/guest/hals/camera/EmulatedCameraFactory.h
+++ b/guest/hals/camera/EmulatedCameraFactory.h
@@ -181,7 +181,7 @@
     sp<EmulatedCameraHotplugThread> mHotplugThread;
 #endif
 
-    /* Back- and front camera properties accessed from cloud metadata server. */
+    /* Back- and front camera properties accessed from the vsoc device. */
     cvd::CameraConfiguration mCameraConfiguration;
     Vector<cvd::CameraDefinition> mCameraDefinitions;
 
diff --git a/guest/hals/gps/gps_vsoc.cpp b/guest/hals/gps/gps_vsoc.cpp
index 2120a1b..fde0e12 100644
--- a/guest/hals/gps/gps_vsoc.cpp
+++ b/guest/hals/gps/gps_vsoc.cpp
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* This implements a GPS hardware HAL library for the Android on Google Cloud.
+
+/* This implements a GPS hardware HAL library for cuttlefish.
  * A produced shared library is placed in /system/lib/hw/gps.gce.so, and
  * loaded by hardware/libhardware/hardware.c code which is called from
  * android_location_GpsLocationProvider.cpp