Change to conventional names