switching tutorial naming conventions