Exchanged __FUNCTION__ with __METHOD__ in debug messages.