Fix for latest Idris

Mostly renaming variables, also new names for dependent pairs.