Typos, clean and update db name.