Put aliases into correct format