Changing stop of daemon to use PID, and updating naming