fixed CS and made names consistent