Add spring() generic and methods
Rename spring* to calendar