Revert "#181 proposed change to use the name not id"

This reverts commit e0e334ad991e73925f477190625ecf787a8899bb.