Small grammer changes and name change