Better table/column naming for activity related tables