[TASK] Change Transaction Name scheme