Use base name everywhere instead of marker file