LPS-45284 Choose better names for class and variables