Rename class/file, better debug printing