Rename things to avoid naming conflicts