Merge "Restrict characters in module names"