database renamed, code fixed