Corrected logging functions + removal of hardcoded function names in log messages