fixing up activity/id names