Don't use module name for list

Change-Id: Id58180056cdde2736be648dfd4287d7e78089f1b
Merge "Don't use module name for list"