Fixed naming error and corrected setup scripts