code made compliant with the new convention