Avoid pain and make DB names more consistent