Refactor parameters name (from idci to icap)