Fixed: Sanitize names