+ Rename ByName to Thunk