Name refactoring of activities/fragments 4 stats

other minor refactoring too.