Names fix + builder