Now generating in separate project.
Using real source names now.