This commit effectively reverts e1172ef8. There are many situations where it would be desirable for project and the generated package name to differ.