Rename some action messages and class