module rename generic -> common