issue #19550: Fix calculation that got mixed up/lost before.
issue #19550: Rename file