Fixes in the title and terminology