Fixes from gestalt-module integration

Fixed some places where Names were compared to Strings.
Checkstyle fixes.