d2: Unify

Change-Id: Ib6eccb5e5ccb79dc6d9ec67b17ae4ea31e2c01e4
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>