[FIX] Refactoing and renaming