LAPPS-37 - Class name changed