Update names to be pinky_*
fix names