Fixed scenario naming
Simplify registration feature