Changes to private/public method naming.

-Changed a few _private/public method names.
(Busy adding "Sound Alarm" and "Global Defense" services to HA component)