Releasing 2.1 with more generic cookie names