Change to underscore naming convention