ice cream fix and more friendly names