rename modules and add more patterns