Add BaseName and ExtName components