Feature/zen 14022

ZEN-14030 better names for the table headers