Cursor Inspector window and some renaming