rename fields + add conditions