2af7a482d9
Related issue: #2766 Motivation: Forgot to rename them before the final release by mistake. Modifications: Rename the classes Result: Better naming