Added better names for the SP.