changing the package name and making log statements more consistent