Fix layout name collisions in TypedResources