Updated to new Rascal. Found naming errors.