merge master, fix names