Add days
Change default naming conventions