Minor changes (renamed class)