Fixed naming conflicts