Renaming activities since there is no reason for a "New" in their names.
Fix up references