rename variables as part of review followup, and obey userIdentifier