update variable names to match naming conventions (though they change all the time, is there much point?)
update variable names to match naming conventions (though they change all the time, is there much point?)

opcon/Substructio,opcon/Substructio