diff --git a/examples/README.md b/examples/README.md
index b68fb8886..fde034dab 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -4,7 +4,7 @@ The scripts in this directory provide various examples of using Confluent's Pyth
 * [asyncio_example.py](asyncio_example.py): AsyncIO webserver with Kafka producer.
 * [consumer.py](consumer.py): Read messages from a Kafka topic.
 * [producer.py](producer.py): Read lines from stdin and send them to a Kafka topic.
-* [eos-transactions.py](eos-transactions.py): Transactional producer with exactly once semantics (EOS).
+* [eos_transactions.py](eos_transactions.py): Transactional producer with exactly once semantics (EOS).
 * [avro_producer.py](avro_producer.py): Produce Avro serialized data using AvroSerializer.
 * [avro_consumer.py](avro_consumer.py): Read Avro serialized data using AvroDeserializer.
 * [json_producer.py](json_producer.py): Produce JSON serialized data using JSONSerializer.
diff --git a/examples/eos-transactions.py b/examples/eos_transactions.py
similarity index 99%
rename from examples/eos-transactions.py
rename to examples/eos_transactions.py
index 6a60aee98..0cba2709a 100755
--- a/examples/eos-transactions.py
+++ b/examples/eos_transactions.py
@@ -109,7 +109,7 @@ def main(args):
 
     producer = Producer({
         'bootstrap.servers': brokers,
-        'transactional.id': 'eos-transactions.py'
+        'transactional.id': 'eos_transactions.py'
     })
 
     # Initialize producer transaction.
diff --git a/tests/test_KafkaError.py b/tests/test_kafka_error.py
similarity index 100%
rename from tests/test_KafkaError.py
rename to tests/test_kafka_error.py
diff --git a/tests/test_SerializerError.py b/tests/test_serializer_error.py
similarity index 100%
rename from tests/test_SerializerError.py
rename to tests/test_serializer_error.py
diff --git a/tests/test_TopicPartition.py b/tests/test_topic_partition.py
similarity index 100%
rename from tests/test_TopicPartition.py
rename to tests/test_topic_partition.py