XAS-172 update to class names