adapting to 2.6 standard
(name fields and strict standards)