LPS-36116
LPS-36116 Source formatting
LPS-36116 Underscore should be included in the suffix