changed names & autocomplete stuff.
db stuff