Couple small naming updates.