Rename bySuffix to byIdSuffix