Make modules consistent
closes #3363
Merge pull request #3364 from permcody/Make_modules_consistent

Make modules consistent