fixes for standardizing the name and better logging