[FIX] Some more renaming fixes