Update SAL and names for clarity.