Changed variable names in database to account for clashing [ci skip]