make database name more generic
update config to more generic info