cleanup
fix duplicate base name handling