Rename plain and component actions to just actions