Added diagnostic name controller