Made modules conform a bit more to existing names.