Adjust more OS names