Fix AP signatures for APs with names which are substrings of other APs

Fix AP signatures for APs with names which are substrings of other APs #2024