review fixes + added rebind test

-changes based on Sam's review on Gitter.
Doesn't seem right to override the display name here, given it could have been set explicitly in the yaml. Perhaps need to only set it if it still has the default value.