Use options hash instead of helper attributes, allow override of partial name