Rename all members to add Message fix 1