Rename database username/password variables for consistency