Headers and property names fix.