Re: Fix debug log incosistencies and function naming