Jan, Two minor fixes for the rename work for this cycle. First one is based on a static analysis report from earlier today. The second one is based on manual review. Thanks! Christian --- --- base-commit: a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 change-id: 20230703-vfs-rename-source-a6093ca69595