Rename module and subroutines