RENAMED the broadcast reciever.

Changed a few methods to use the data structures.