[FIX] Naming conflict fixed
[TASK] clean up