BUG: Cleanup incorrectly defined names
STY: Pep-8
Merge pull request #1600 from jseabold/regression-plots-fixes

CLN: Regression plots fixes