Remove that old crappy naming system