Replaced use of es_liq by es_liq_default, likewise for ice to make the
intent clear.

Replaced use of TK and PPa by T and P to ensure consistency.