GEP-19 Modified typos to remove previous code instances