Fixed wrong renamed value identifiers