Reordering and renaming verb aspect to verb conjugation type

This is to make the order of verb conjugation types more logical rather
than alphabetical according to the code.