Fix missed renames

[#75217152]

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>