This is a simple change so we avoid redefining this string.

Depends on D4153

This is a simple refactor. I tested it in combination with stack (see test plan in D4151), and also used Flow