datetime naming refactoring