Name and other minor changes