rename fields and definition and view
Merge branch 'henryleu'