updated README and database.py for new naming scheme