Database update (Final)

naming convetions