ReferenceAnalysis creation: Remove invalid fields

Also, force the renameAfterCreation, which was not firing.