diff --git a/wetb/hawc2/htcfile.py b/wetb/hawc2/htc_file.py
similarity index 100%
rename from wetb/hawc2/htcfile.py
rename to wetb/hawc2/htc_file.py
diff --git a/wetb/hawc2/shearfile.py b/wetb/hawc2/shear_file.py
similarity index 100%
rename from wetb/hawc2/shearfile.py
rename to wetb/hawc2/shear_file.py
diff --git a/wetb/hawc2/tests/test_htc_file.py b/wetb/hawc2/tests/test_htc_file.py
index 4cad7974ec5a6d34716f77fc72571cce4adeab87..ec018d1590524a3850dd7e70d25784e1baebd56e 100644
--- a/wetb/hawc2/tests/test_htc_file.py
+++ b/wetb/hawc2/tests/test_htc_file.py
@@ -7,7 +7,7 @@ import os
 import unittest
 
 from datetime import datetime
-from wetb.hawc2.htcfile import HTCFile
+from wetb.hawc2.htc_file import HTCFile
 
 os.chdir(os.path.relpath(".", __file__))
 
diff --git a/wetb/hawc2/tests/test_shearfile.py b/wetb/hawc2/tests/test_shear_file.py
similarity index 83%
rename from wetb/hawc2/tests/test_shearfile.py
rename to wetb/hawc2/tests/test_shear_file.py
index 6670e6f2e2067f44a27f0b51baf6526fcd892bbe..4dbca846548a35d0ed6e5dd1933efd283b0411af 100644
--- a/wetb/hawc2/tests/test_shearfile.py
+++ b/wetb/hawc2/tests/test_shear_file.py
@@ -4,7 +4,7 @@ Created on 05/11/2015
 @author: MMPE
 '''
 import unittest
-from wetb.hawc2 import shearfile
+from wetb.hawc2 import shear_file
 import numpy as np
 import os
 testfilepath = 'test_files/'
@@ -13,7 +13,7 @@ class Test(unittest.TestCase):
 
     def test_shearfile(self):
         f = testfilepath + "tmp_shearfile.dat"
-        shearfile.save(f, [-55, 55], [30, 100, 160] , u=np.array([[0.7, 1, 1.3], [0.7, 1, 1.3]]).T)
+        shear_file.save(f, [-55, 55], [30, 100, 160] , u=np.array([[0.7, 1, 1.3], [0.7, 1, 1.3]]).T)
         with open(f) as fid:
             self.assertEqual(fid.read(),
 """ # autogenerated shear file