rename to system_add/system_remove for consistency