Fix naming conflicts