changed some naming and synced db