Enrollment and friendly name fixes

Jira Issue: WP-955
Changed to read pzh module everytime it starts.

Jira Issue: WP-955