Fix variableRenamingPolicy setting not working