diff --git a/libartbase/base/bit_vector.cc b/libartbase/base/bit_vector.cc
index c706c7ebf2..2ef14d7074 100644
--- a/libartbase/base/bit_vector.cc
+++ b/libartbase/base/bit_vector.cc
@@ -154,7 +154,7 @@ bool BitVector::Union(const BitVector* src) {
 
     EnsureSize(highest_bit);
 
-    // Paranoid: storage size should be big enough to hold this bit now.
+    // Check: storage size should be big enough to hold this bit now.
     DCHECK_LT(static_cast<uint32_t> (highest_bit), storage_size_ * kWordBits);
   }
 
@@ -186,7 +186,7 @@ bool BitVector::UnionIfNotIn(const BitVector* union_with, const BitVector* not_i
   if (storage_size_ < union_with_size) {
     EnsureSize(highest_bit);
 
-    // Paranoid: storage size should be big enough to hold this bit now.
+    // Check: storage size should be big enough to hold this bit now.
     DCHECK_LT(static_cast<uint32_t> (highest_bit), storage_size_ * kWordBits);
   }
 
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 9fb6c8d93d..c3ef0a960b 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -426,7 +426,7 @@ cc_defaults {
         "external/dex_file_supp.cc",
     ],
     cflags: ["-DSTATIC_LIB"],
-    // Using whole_static_libs here only as a "poor man's transitivity" kludge.
+    // Using whole_static_libs here only as an "approximate transitivity" kludge.
     whole_static_libs: [
         "libbase",
         "liblog",
diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc
index 3e3691a16a..bf1b4f0714 100644
--- a/openjdkjvmti/deopt_manager.cc
+++ b/openjdkjvmti/deopt_manager.cc
@@ -421,13 +421,13 @@ jvmtiError DeoptManager::AddDeoptimizeThreadMethods(art::ScopedObjectAccessUnche
   if (target->IncrementForceInterpreterCount() == 1) {
     struct DeoptClosure : public art::Closure {
      public:
-      explicit DeoptClosure(DeoptManager* man) : man_(man) {}
+      explicit DeoptClosure(DeoptManager* manager) : manager_(manager) {}
       void Run(art::Thread* self) override REQUIRES_SHARED(art::Locks::mutator_lock_) {
-        man_->DeoptimizeThread(self);
+        manager_->DeoptimizeThread(self);
       }
 
      private:
-      DeoptManager* man_;
+      DeoptManager* manager_;
     };
     DeoptClosure c(this);
     target->RequestSynchronousCheckpoint(&c);
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 33878e63a7..e4a7e1c9ec 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -260,7 +260,7 @@ class LOCKABLE Mutex : public BaseMutex {
 
   int32_t get_contenders() {
     // Result is guaranteed to include any contention added by this thread; otherwise approximate.
-    // Treat contenders as unsigned because we're paranoid about overflow; should never matter.
+    // Treat contenders as unsigned because we're concerned about overflow; should never matter.
     return static_cast<uint32_t>(state_and_contenders_.load(std::memory_order_relaxed))
         >> kContenderShift;
   }
diff --git a/runtime/linear_alloc.h b/runtime/linear_alloc.h
index 87086f29d4..1d01f84072 100644
--- a/runtime/linear_alloc.h
+++ b/runtime/linear_alloc.h
@@ -24,7 +24,7 @@ namespace art {
 
 class ArenaPool;
 
-// TODO: Support freeing if we add poor man's class unloading.
+// TODO: Support freeing if we add class unloading.
 class LinearAlloc {
  public:
   explicit LinearAlloc(ArenaPool* pool);
diff --git a/test/1959-redefine-object-instrument/src/Main.java b/test/1959-redefine-object-instrument/src/Main.java
index b3201f6e0e..4aabd5f289 100644
--- a/test/1959-redefine-object-instrument/src/Main.java
+++ b/test/1959-redefine-object-instrument/src/Main.java
@@ -39,7 +39,7 @@ public static void notifyBreakpointReached(Thread thr, Executable e, long l) {}
 
   public static void doTest() throws Exception {
     final Object lock = new Object();
-    Breakpoint.Manager man = new Breakpoint.Manager();
+    Breakpoint.Manager manager = new Breakpoint.Manager();
     Breakpoint.startBreakpointWatch(
         Main.class,
         Main.class.getDeclaredMethod("notifyBreakpointReached", Thread.class, Executable.class, Long.TYPE),
@@ -56,15 +56,15 @@ public static void doTest() throws Exception {
       }
     });
     // set the breakpoint.
-    man.setBreakpoint(Main.class.getDeclaredMethod("doNothing"), 0l);
+    manager.setBreakpoint(Main.class.getDeclaredMethod("doNothing"), 0l);
     thr.start();
     while (!started || thr.getState() != Thread.State.TIMED_WAITING);
     // Redefine while thread is paused.
     forceRedefine(Object.class, Thread.currentThread());
     // Clear breakpoints.
-    man.clearAllBreakpoints();
+    manager.clearAllBreakpoints();
     // set the breakpoint again.
-    man.setBreakpoint(Main.class.getDeclaredMethod("doNothing"), 0l);
+    manager.setBreakpoint(Main.class.getDeclaredMethod("doNothing"), 0l);
     // Wakeup
     synchronized(lock) {
       lock.notifyAll();