Missed a few underscore prefix's. Fixed current build errors.