Fix dependencies in many forms with same name fileds