fix name variables