Fix broken util tags

The context was accidentally being included in the name/type/etc. This
removes the context from those.
Appears to fix the recent attribute / tag issues.
Merge pull request #614 from mcmonkey4eva/master

@Doppler