Refactor class names to match Udemy names