Edited variables names, usename and database name