Fixed naming of module to be consistent with classes
Fixed a bug in group by clause of distinct join