PLA-817 moved $term to abstract class