fixed GetOrCreate functions passing in encoded names