Adding option to remove hook and changing terminology.