Fix d2k spacing and ordering style nits.
Fix d2k naming style nits.
Add Mods.D2k to make check.