Update class names to not use deprecated aliases