[FIX] Rename files and timer fixes