diff --git a/tensorflow_privacy/privacy/analysis/tensor_buffer_test_eager.py b/tensorflow_privacy/privacy/analysis/tensor_buffer_eager_test.py
similarity index 96%
rename from tensorflow_privacy/privacy/analysis/tensor_buffer_test_eager.py
rename to tensorflow_privacy/privacy/analysis/tensor_buffer_eager_test.py
index 12fadf9..ad921c7 100644
--- a/tensorflow_privacy/privacy/analysis/tensor_buffer_test_eager.py
+++ b/tensorflow_privacy/privacy/analysis/tensor_buffer_eager_test.py
@@ -41,7 +41,7 @@ class TensorBufferTest(tf.test.TestCase):
     self.assertAllEqual(my_buffer.values.numpy(), [value1, value2])
 
   def test_fail_on_scalar(self):
-    with self.assertRaisesRegexp(ValueError, 'Shape cannot be scalar.'):
+    with self.assertRaisesRegex(ValueError, 'Shape cannot be scalar.'):
       tensor_buffer.TensorBuffer(1, ())
 
   def test_fail_on_inconsistent_shape(self):
@@ -49,7 +49,7 @@ class TensorBufferTest(tf.test.TestCase):
 
     my_buffer = tensor_buffer.TensorBuffer(size, shape, name='my_buffer')
 
-    with self.assertRaisesRegexp(
+    with self.assertRaisesRegex(
         tf.errors.InvalidArgumentError,
         'Appending value of inconsistent shape.'):
       my_buffer.append(tf.ones(shape=[3, 4], dtype=tf.int32))
diff --git a/tensorflow_privacy/privacy/analysis/tensor_buffer_test_graph.py b/tensorflow_privacy/privacy/analysis/tensor_buffer_graph_test.py
similarity index 100%
rename from tensorflow_privacy/privacy/analysis/tensor_buffer_test_graph.py
rename to tensorflow_privacy/privacy/analysis/tensor_buffer_graph_test.py