Fixed $ui2fp, $si2fp naming.