...as names collide
tidy up