Checkstyle fixes
Fixed some places where Names were compared to Strings.
Merge pull request #1154 from immortius/develop

Fixes from gestalt-module integration