diff --git a/peerd/avahi_client_unittest.cc b/peerd/avahi_client_test.cc
similarity index 100%
rename from peerd/avahi_client_unittest.cc
rename to peerd/avahi_client_test.cc
diff --git a/peerd/avahi_service_publisher_unittest.cc b/peerd/avahi_service_publisher_test.cc
similarity index 100%
rename from peerd/avahi_service_publisher_unittest.cc
rename to peerd/avahi_service_publisher_test.cc
diff --git a/peerd/discovered_peer_unittest.cc b/peerd/discovered_peer_test.cc
similarity index 100%
rename from peerd/discovered_peer_unittest.cc
rename to peerd/discovered_peer_test.cc
diff --git a/peerd/manager_unittest.cc b/peerd/manager_test.cc
similarity index 100%
rename from peerd/manager_unittest.cc
rename to peerd/manager_test.cc
diff --git a/peerd/peer_manager_impl_unittest.cc b/peerd/peer_manager_impl_test.cc
similarity index 100%
rename from peerd/peer_manager_impl_unittest.cc
rename to peerd/peer_manager_impl_test.cc
diff --git a/peerd/peer_unittest.cc b/peerd/peer_test.cc
similarity index 100%
rename from peerd/peer_unittest.cc
rename to peerd/peer_test.cc
diff --git a/peerd/peerd.gyp b/peerd/peerd.gyp
index 1f9a65e..7e26178 100644
--- a/peerd/peerd.gyp
+++ b/peerd/peerd.gyp
@@ -1,6 +1,3 @@
-# TODO: Rename these files to pass this check.
-# gyplint: disable=GypLintSourceFileNames
-
 {
   'target_defaults': {
     'variables': {
@@ -101,14 +98,14 @@
           },
           'includes': ['../common-mk/common_test.gypi'],
           'sources': [
-            'avahi_client_unittest.cc',
-            'avahi_service_publisher_unittest.cc',
-            'discovered_peer_unittest.cc',
-            'manager_unittest.cc',
-            'peer_manager_impl_unittest.cc',
-            'peer_unittest.cc',
-            'published_peer_unittest.cc',
-            'service_unittest.cc',
+            'avahi_client_test.cc',
+            'avahi_service_publisher_test.cc',
+            'discovered_peer_test.cc',
+            'manager_test.cc',
+            'peer_manager_impl_test.cc',
+            'peer_test.cc',
+            'published_peer_test.cc',
+            'service_test.cc',
             'test_util.cc',
           ],
         },
diff --git a/peerd/published_peer_unittest.cc b/peerd/published_peer_test.cc
similarity index 100%
rename from peerd/published_peer_unittest.cc
rename to peerd/published_peer_test.cc
diff --git a/peerd/service_unittest.cc b/peerd/service_test.cc
similarity index 100%
rename from peerd/service_unittest.cc
rename to peerd/service_test.cc