Improve local and remote effect naming scheme(2).