Better names, new ids and bump