Tweak return value names for consistency