Only one type def enum instead of 3. Rename vaiables