rename - more template work