Refactor variable names to more mnemonic in HIO & NLCG