Fix naming issues