Name collision fixes