Some labels and messages were changed