Rename functions into actions, refactoring complete!