Resolve #3475979 "Remove prefixed abbreviations"

m4oliveirequested to merge
issue/drupal-3475979:3475979-remove-prefixed-abbreviations into 11.x

Closes #3475979

Merge request reports