Lps 49136 Rename decoupled classes