Rename classes to line up with TREx naming convention