FindIce: Adopt current upstream naming and usage conventions