Changed the way we get the db name