Fix mapping naming issue