Better naming, and prompt for NOT NULL field addition