Changing log messages to reflect correct class name
Changing string to constant