cosmetic changes so these modules will work with the strict new naming scheme
8 files changed