few more changes to RenamingKeysUpdateStreamFactory and test