Handle non-CGed names correctly.