Data Export Error when forms have the same Form Name

1. What is the problem? Be very detailed.
When Pulling and Exporting forms, sometimes the data from 2 forms are combined into a single export CSV. This occurs when the forms have different FormID's but the Form Names are the same. Example:
FormName FormID
PeopleForm PF1
PeopleForm PF2

2. What app or server are you using and on what device and operating system? Include version numbers.
ODKbriefcase 1.17.4
connecting to a ODKAggregate server v2.05

3. What you have you tried to fix the problem?
Create two storage and export directories.
On ODKAggregate, turn off Downloadable for Form 2.
Pull and export Form 1 to storage dir 1, export dir 1.
On ODKAggregate, turn on Downloadable for Form 2.
On ODKAggregate, turn off Downloadable for Form 1.
Pull and export Form 2 to storage dir 2, export dir .

4. What steps can we take to reproduce the problem?
Create 2 different forms with same name and different Form ID's.

5. Anything else we should know or have? If you have a test form or screenshots or logs, attach below.