FIX: More robust transaction naming