refactorings: distinguish between year and yearNumber, etc