Nametag integration commit to master