LPS-48368 Update names for the comments to make it more consistent