fix broken swap names, rebuild!