More consistent year names
Stricter forms