Store name after computing
Remove sparsely used underscore dependency