Renamed some files and changed DB name

Renamed some files and changed DB name