Merge "Change chart to fullname instead of servicename"