add new activity and fix some old naming bugs