NXP-11739: clean up and rename operation