Merge "Missed these ones in the previous rename." into froyo