Rename *Generic -> *Common.