Better handling of input module names.