Rename + cleanUp addition