Made action function names more consistent