HOPKINS: More renaming, fix a memory leak