I don't remember creating a JIRA for this.
I doubt we can change it until we change the classes in ORM