first step of TimeEntry refactoring and renaming