Refactored class names

Removed Activity_ prefixes for activity class names.