Missed a couple camel case fixes.
Adding exclusions to fix tests.