Change VAR names to stop conflict with DB creds