refactoring variable names, changed plugin ifc