DU-ify things

Change-Id: Ie5968fb13a2d9c33dc7ce072300f7dfa742295ea