A few changes to names and version bounds