Merge "Correct variable references for namespace shift"