Issue #2349413 by jetmartin: Keep using the d7 action naming pattern.