[FIX] Rename and other small fixes