Refactoring names, adding to GCM message handling