corrections to crosswalk

corrected name of rights template; added in logic to clean up discipline
names