LPS-49192 follow naming convention