Fixed some naming issues from merge