added 'Activity' to appropriate class names