Revert namechange to mcd (until we've fixed the entire make)

Change-Id: I0f179e80d7f5d63defa8f1ff56d0a9a4f2abe920