Fixed remaining naming conflicts