diff --git a/taglib/toolkit/trefcountptr.h b/taglib/toolkit/trefcountptr.h
index e4ed2b9a..8abc6720 100644
--- a/taglib/toolkit/trefcountptr.h
+++ b/taglib/toolkit/trefcountptr.h
@@ -79,15 +79,15 @@ namespace TagLib {
 
     // Counter base class. Provides a reference counter.
 
-    class counter_base
+    class CounterBase
     {
     public:
-      counter_base() 
+      CounterBase() 
         : count(1) 
       {
       }
 
-      virtual ~counter_base()
+      virtual ~CounterBase()
       {
       }
 
@@ -144,10 +144,10 @@ namespace TagLib {
     // Counter impl class. Provides a dynamic deleter.
 
     template <typename U>
-    class counter_impl : public counter_base
+    class CounterImpl : public CounterBase
     {
     public:
-      counter_impl(U *p)
+      CounterImpl(U *p)
         : p(p)
       {
       }
@@ -169,7 +169,7 @@ namespace TagLib {
   public:
     template <typename U>
     explicit RefCountPtr(U *p)
-      : counter(new counter_impl<U>(p))
+      : counter(new CounterImpl<U>(p))
     {
     }
 
@@ -186,7 +186,7 @@ namespace TagLib {
 
     T *get() const
     {
-      return static_cast<counter_impl<T>*>(counter)->get();
+      return static_cast<CounterImpl<T>*>(counter)->get();
     }
 
     long use_count() const
@@ -205,7 +205,7 @@ namespace TagLib {
       if(get() != p)
       {
         counter->release();
-        counter = new counter_impl<U>(p);
+        counter = new CounterImpl<U>(p);
       }
     }
 
@@ -247,7 +247,7 @@ namespace TagLib {
     }
 
   private:
-    counter_base *counter;
+    CounterBase *counter;
   };
 }
 #endif // TAGLIB_USE_CXX11