Make modules consistent

closes #3363