Merge "Rename some variables in NsdService"