CB-6321 Fixed some typos/updated filenames