Better transaction names and logic