diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
index 4d11e50bbd0..db09f8719bb 100644
--- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
@@ -32,12 +32,11 @@
 #include "oops/oop.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-template<bool promote_immediately>
+template <bool promote_immediately>
 class PSRootsClosure: public OopClosure {
- private:
+private:
   PSPromotionManager* _promotion_manager;
 
- protected:
   template <class T> void do_oop_work(T *p) {
     if (PSScavenge::should_scavenge(p)) {
       // We never card mark roots, maybe call a func without test?
@@ -55,12 +54,12 @@ typedef PSRootsClosure</*promote_immediately=*/true> PSPromoteRootsClosure;
 
 // Scavenges a single oop in a ClassLoaderData.
 class PSScavengeFromCLDClosure: public OopClosure {
- private:
+private:
   PSPromotionManager* _pm;
   // Used to redirty a scanned cld if it has oops
   // pointing to the young generation after being scanned.
   ClassLoaderData*    _scanned_cld;
- public:
+public:
   PSScavengeFromCLDClosure(PSPromotionManager* pm) : _pm(pm), _scanned_cld(NULL) { }
   void do_oop(narrowOop* p) { ShouldNotReachHere(); }
   void do_oop(oop* p)       {
@@ -89,7 +88,7 @@ class PSScavengeFromCLDClosure: public OopClosure {
     _scanned_cld = cld;
   }
 
- private:
+private:
   void do_cld_barrier() {
     assert(_scanned_cld != NULL, "Should not be called without having a scanned cld");
     _scanned_cld->record_modified_oops();
@@ -98,10 +97,9 @@ class PSScavengeFromCLDClosure: public OopClosure {
 
 // Scavenges the oop in a ClassLoaderData.
 class PSScavengeCLDClosure: public CLDClosure {
- private:
+private:
   PSScavengeFromCLDClosure _oop_closure;
- protected:
- public:
+public:
   PSScavengeCLDClosure(PSPromotionManager* pm) : _oop_closure(pm) { }
   void do_cld(ClassLoaderData* cld) {
     // If the cld has not been dirtied we know that there's
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index 85e3a934208..8160b31be22 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -157,7 +157,7 @@ inline void ParCompactionManager::follow_array(objArrayOop obj, int index) {
 
 inline void ParCompactionManager::update_contents(oop obj) {
   if (!obj->klass()->is_typeArray_klass()) {
-    PSAdjustPointerClosure apc(this);
+    PCAdjustPointerClosure apc(this);
     obj->oop_iterate(&apc);
   }
 }
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 9a8e2501775..e98e572c4e3 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -2203,7 +2203,7 @@ void PSParallelCompact::adjust_roots(ParCompactionManager* cm) {
   // Need new claim bits when tracing through and adjusting pointers.
   ClassLoaderDataGraph::clear_claimed_marks();
 
-  PSAdjustPointerClosure oop_closure(cm);
+  PCAdjustPointerClosure oop_closure(cm);
 
   // General strong roots.
   Universe::oops_do(&oop_closure);
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
index 9c6d39fdce5..c1949e2de0d 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
@@ -124,9 +124,9 @@ inline void PSParallelCompact::adjust_pointer(T* p, ParCompactionManager* cm) {
   }
 }
 
-class PSAdjustPointerClosure: public BasicOopIterateClosure {
- public:
-  PSAdjustPointerClosure(ParCompactionManager* cm) {
+class PCAdjustPointerClosure: public BasicOopIterateClosure {
+public:
+  PCAdjustPointerClosure(ParCompactionManager* cm) {
     assert(cm != NULL, "associate ParCompactionManage should not be NULL");
     _cm = cm;
   }
@@ -137,7 +137,7 @@ class PSAdjustPointerClosure: public BasicOopIterateClosure {
   // This closure provides its own oop verification code.
   debug_only(virtual bool should_verify_oops() { return false; })
   virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
- private:
+private:
   ParCompactionManager* _cm;
 };
 
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index 687dd3bce0b..c8dac589d2d 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -33,7 +33,7 @@ class ClassFileParser;
 // An InstanceClassLoaderKlass is a specialization of the InstanceKlass. It does
 // not add any field.  It is added to walk the dependencies for the class loader
 // key that this class loader points to.  This is how the loader_data graph is
-// walked and dependant class loaders are kept alive.  I thought we walked
+// walked and dependent class loaders are kept alive.  I thought we walked
 // the list later?
 
 class InstanceClassLoaderKlass: public InstanceKlass {
@@ -52,7 +52,6 @@ public:
   //
   // The InstanceClassLoaderKlass iterators also visit the CLD pointer (or mirror of anonymous klasses.)
 
- public:
   // Forward iteration
   // Iterate over the oop fields and metadata.
   template <typename T, class OopClosureType>