Fix some naming artifacts