LP#1538691: More changes to terminology