Removed .x from module names.