rename some sub uses