add nonstandard module naming support