Changed class names to use StudlyCaps as per Python guidelines