Some updates to the projects and solutions to generate the correctly named assemblies