mmsd: Rename some variables

7 jobs for wip/sadiq/mm-cleanup in 11 minutes and 8 seconds (queued for 1 second)