LPS-36303 Typos
LPS-36303 Rename methods
LPS-36303 Sort