File Names and compile fixes

- Add db file names
- Fix compile errors