Rename parameter from `entity` to `machine`?