updated table names acc to conventions #282