Improve local and remote effect naming scheme.