Cookies bugfix and rename