Rename folders to work well with TM2