rose date: improve names and comments