DU-ify things

Change-Id: If0189f4dbccf310a999c5bd57c885a15a5d5ae2f