Minor nits.
Updated names of fake modules.