LPS-41515
LPS-41473
LPS-41473 - Rename to roleName to keep code consistent
LPS-41473 - Source formatting
LPS-41473 - fix unit test