Refactored code for convention of naming Android activities with a filename with an Activity suffix.