more stripdown
Renaming