DRY dependancy check

- rename validations for consistency