reconcile form naming conflicts