Fix for camel case/underscore function inconsistency