Names fixes