Merge pull request #1964 from ktsaou/master

rename chart fields to avoid conflicts with backends;