Z3: Get naming right