Bulk in transaction and a little renaming