Issue #391 - Add explicit ordering of module names

This fixes #391.