Renaming to use underscore convention