Rename db classes to make room for commit type