Relocated typename code