make variable names consistent with database.yml