Rename file and fix comments