Make them all consistent