Change some names and offset