Rename templates. Update messanger logic.