Fix issue with imported reserved names from #214