Changed tutorial, changed names