Fix database converting due naming issues (fixes #33)