fix name locations