Fixed names and language to reflect product naming