find and fix naming errors

bad issues located, I think. retest now.