use new conditional names
1 file changed