--- old/src/share/vm/gc/parallel/gcTaskManager.cpp	2016-07-07 21:14:05.256288342 -0700
+++ new/src/share/vm/gc/parallel/gcTaskManager.cpp	2016-07-07 21:14:05.140288346 -0700
@@ -390,7 +390,7 @@
 
   _created_workers = WorkerManager::add_workers(this,
                                                 _active_workers,
-                                                (uint) _workers,
+                                                _workers,
                                                 _created_workers,
                                                 worker_type,
                                                 initializing);
@@ -400,7 +400,7 @@
 }
 
 const char* GCTaskManager::group_name() {
-  return GCTaskThread::task_name();
+  return "ParGC Thread";
 }
 
 void GCTaskManager::initialize() {
--- old/src/share/vm/gc/parallel/gcTaskThread.cpp	2016-07-07 21:14:05.948288318 -0700
+++ new/src/share/vm/gc/parallel/gcTaskThread.cpp	2016-07-07 21:14:05.828288322 -0700
@@ -36,8 +36,6 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 
-#define PARGCTHREAD "ParGC Thread"
-
 GCTaskThread::GCTaskThread(GCTaskManager* manager,
                            uint           which,
                            uint           processor_id) :
@@ -47,7 +45,7 @@
   _time_stamp_index(0)
 {
   set_id(which);
-  set_name(PARGCTHREAD "#%d", which);
+  set_name("%s#%d", manager->group_name(), which);
 }
 
 GCTaskThread::~GCTaskThread() {
@@ -56,8 +54,6 @@
   }
 }
 
-const char* GCTaskThread::task_name() { return PARGCTHREAD; }
-
 GCTaskTimeStamp* GCTaskThread::time_stamp_at(uint index) {
   guarantee(index < GCTaskTimeStampEntries, "increase GCTaskTimeStampEntries");
   if (_time_stamps == NULL) {
--- old/src/share/vm/gc/parallel/gcTaskThread.hpp	2016-07-07 21:14:06.624288294 -0700
+++ new/src/share/vm/gc/parallel/gcTaskThread.hpp	2016-07-07 21:14:06.504288298 -0700
@@ -55,7 +55,6 @@
     return new GCTaskThread(manager, which, processor_id);
   }
  public:
-  static const char* task_name();
 
   static void destroy(GCTaskThread* manager) {
     if (manager != NULL) {
--- old/src/share/vm/gc/shared/workerManager.hpp	2016-07-07 21:14:07.292288271 -0700
+++ new/src/share/vm/gc/shared/workerManager.hpp	2016-07-07 21:14:07.176288275 -0700
@@ -58,7 +58,7 @@
       WorkerThread* new_worker = holder->install_worker(worker_id);
       assert(new_worker != NULL, "Failed to allocate GangWorker");
       if (new_worker == NULL || !os::create_thread(new_worker, worker_type)) {
-        if(initializing) {
+        if (initializing) {
           vm_exit_out_of_memory(0, OOM_MALLOC_ERROR,
                   "Cannot create worker GC thread. Out of system resources.");
         }
@@ -79,8 +79,8 @@
                                   bool initializing) {
     if (previous_created_workers < created_workers) {
       const char* initializing_msg =  initializing ? "Adding initial" : "Creating additional";
-      log_trace(gc, task)("%s %s(s) active workers %u created workers %u",
-        initializing_msg, holder->group_name(), active_workers, created_workers);
+      log_trace(gc, task)("%s %s(s) previously created workers %u active workers %u total created workers %u",
+                          initializing_msg, holder->group_name(), previous_created_workers, active_workers, created_workers);
     }
   }
 };