Simplify, rename case by case