Handle name variants. Phew