Fix some naming issues