Fixed a package name issue and a few sonar suggestions.
8 files changed