Updated to friendly names.