Change some names and debugging output