Refactor. Remove redundant action suffix.