changed some names in regards to the database