Constant action names, change make / unmake method language