Fix return names