UP-4065:  Some renaming for clarity