Rename class to adhere to convention, and make tutorial methods static