Refactor tutorial naming scheme