improved naming of classes