Refactors our the d2- prefix on directives and adjusts dist and doc for it