Fix dev not compiling.

I ported this from my work dev kitchen an apparently I made minor naming
errors.  This commit fixes some of the more obvious issues.