swait: adapt to swait API changes and include file name changes Signed-off-by: Clark Williams <williams@redhat.com>