FIXED: Update more variable names to map prefix