Fixed class naming extra 's'