try to get more coherent names