Change to use unexported names in modules.