LPS-48127 SF - Renaming classes. Since they're locally scoped, they can have a shorter name.