-fix form and navigation url based on old names