Change to aai-parent and sonar xml