Adjusting naming. Checking still works