Adjusted amd modual names