Module reference fixes.
More name fixups.