GPII-543: Proper naming.