Some classes renamed

Signed-off-by: ocen713 <ocen713@gmail.com>