fixed bug with name collisions due to new inheritance