Rename some things to avoid dumb namespace pollution