[FIX] Ranaming suffix