rename + cleanup