Renamed namespaces to use PascalCase
Fixed old class names