diff --git a/src/diana/diana.py b/src/diana/diana.py
--- a/src/diana/diana.py
+++ b/src/diana/diana.py
@@ -4,8 +4,8 @@ import re
 from . import config as cfg
 from . import go
 from .go import BLACK, WHITE, EMPTY
-from .sgfParser import ParserError
-from .sgfParser.collection import Collection
+from .sgfparser import ParserError
+from .sgfparser.collection import Collection
 from .drawer.svg import Svg
 from .drawer.tikz import Tikz
 
diff --git a/src/diana/drawer/base.py b/src/diana/drawer/base.py
--- a/src/diana/drawer/base.py
+++ b/src/diana/drawer/base.py
@@ -15,7 +15,7 @@ class DiagramPoint:
 		return 'DiagramPoint({0},{1},"{2}","{3}")'.format(self.x, self.y, self.color, self.label)
 
 
-class Base:
+class Drawer:
 	high_numbers = True
 
 	def __init__(self, start=0):
diff --git a/src/diana/drawer/svg.py b/src/diana/drawer/svg.py
--- a/src/diana/drawer/svg.py
+++ b/src/diana/drawer/svg.py
@@ -1,4 +1,4 @@
-from .base import Base
+from .base import Drawer
 
 
 def adjust_font(base, text):
@@ -11,7 +11,7 @@ def adjust_font(base, text):
 		return round(0.4*base)
 
 
-class Svg(Base):
+class Svg(Drawer):
 	extension = "svg"
 
 	padding = 15
diff --git a/src/diana/sgfParser/__init__.py b/src/diana/sgfparser/__init__.py
rename from src/diana/sgfParser/__init__.py
rename to src/diana/sgfparser/__init__.py
diff --git a/src/diana/sgfParser/collection.py b/src/diana/sgfparser/collection.py
rename from src/diana/sgfParser/collection.py
rename to src/diana/sgfparser/collection.py
--- a/src/diana/sgfParser/collection.py
+++ b/src/diana/sgfparser/collection.py
@@ -1,6 +1,6 @@
 from .node import Node
 from . import skip_whitespace, ParserError
-from .gameRecord import GameRecord
+from .game_record import GameRecord
 
 
 class Collection:
diff --git a/src/diana/sgfParser/gameRecord.py b/src/diana/sgfparser/game_record.py
rename from src/diana/sgfParser/gameRecord.py
rename to src/diana/sgfparser/game_record.py
diff --git a/src/diana/sgfParser/node.py b/src/diana/sgfparser/node.py
rename from src/diana/sgfParser/node.py
rename to src/diana/sgfparser/node.py
diff --git a/src/diana/sgfParser/propValues.py b/src/diana/sgfparser/prop_values.py
rename from src/diana/sgfParser/propValues.py
rename to src/diana/sgfparser/prop_values.py
diff --git a/src/diana/sgfParser/property.py b/src/diana/sgfparser/property.py
rename from src/diana/sgfParser/property.py
rename to src/diana/sgfparser/property.py
--- a/src/diana/sgfParser/property.py
+++ b/src/diana/sgfparser/property.py
@@ -2,7 +2,7 @@ import re
 from datetime import date
 import logging as log
 
-from .propValues import choose, singleton, list_of, compose, number, real, double, color, text, empty, anything, point, move, stone
+from .prop_values import choose, singleton, list_of, compose, number, real, double, color, text, empty, anything, point, move, stone
 from . import skip_whitespace, ParserError
 
 GAME_INFO = 1
diff --git a/src/diana/tests/testSgfParser.py b/src/diana/tests/test_sgf_parser.py
rename from src/diana/tests/testSgfParser.py
rename to src/diana/tests/test_sgf_parser.py
--- a/src/diana/tests/testSgfParser.py
+++ b/src/diana/tests/test_sgf_parser.py
@@ -4,10 +4,10 @@ import unittest
 from unittest import TestCase
 import os
 
-from ..sgfParser import str_row_col
-from ..sgfParser.collection import Collection
-from ..sgfParser.property import Property, DateProperty, DateException
-from ..sgfParser.propValues import text, compose
+from ..sgfparser import str_row_col
+from ..sgfparser.collection import Collection
+from ..sgfparser.property import Property, DateProperty, DateException
+from ..sgfparser.prop_values import text, compose
 
 
 dataDir = os.path.join(os.path.dirname(__file__), "data")