LPS-49773 Source format - Rename variables