Renaming Activities to make them less ambiguous