Align service constant and correct output msg