Fixed renamed mapping