Default config should reflect module names

Change-Id: I437460a6a526bfeb5c2806e7c9797037111eacd6