Improved clarity of the delegate scope

[harrychin]

The current naming works and does not no-op but this change is both easier to read and more likely to be forwards compatible.