debug logging now set to false.
tweak to naming logic