Replace zombie instantiation with 'subject'.
Fix incorrect 'name' attribute.w