I have a hunch common is silly.  Removed.
Fix some bad naming