Rename, format, fix comments